服务接口注释完善

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -714,6 +714,9 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
 
     /**
      * 根据条件搜索会员分组
+     *
+     * @param params
+     * @return
      * */
     @Override
     public List<MtUserGrade> queryMemberGradeByParams(Map<String, Object> params) {
@@ -726,6 +729,10 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
 
     /**
      * 获取会员数量
+     *
+     * @param merchantId
+     * @param storeId
+     * @return
      * */
     @Override
     public Long getUserCount(Integer merchantId, Integer storeId) {
@@ -738,6 +745,12 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
 
     /**
      * 获取会员数量
+     *
+     * @param merchantId
+     * @param storeId
+     * @param beginTime
+     * @param endTime
+     * @return
      * */
     @Override
     public Long getUserCount(Integer merchantId, Integer storeId, Date beginTime, Date endTime) {
@@ -750,6 +763,12 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
 
     /**
      * 获取会员数量
+     *
+     * @param merchantId
+     * @param storeId
+     * @param beginTime
+     * @param endTime
+     * @return
      * */
     @Override
     public Long getActiveUserCount(Integer merchantId, Integer storeId, Date beginTime, Date endTime) {

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -1201,6 +1201,12 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
     /**
      * 获取订单数量
+     *
+     * @param merchantId
+     * @param storeId
+     * @param beginTime
+     * @param endTime
+     * @return
      * */
     @Override
     public BigDecimal getOrderCount(Integer merchantId, Integer storeId, Date beginTime, Date endTime) {
@@ -1213,6 +1219,12 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
     /**
      * 获取支付金额
+     *
+     * @param merchantId
+     * @param storeId
+     * @param beginTime
+     * @param endTime
+     * @return
      * */
     @Override
     public BigDecimal getPayMoney(Integer merchantId, Integer storeId, Date beginTime, Date endTime) {
@@ -1225,6 +1237,10 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
     /**
      * 获取支付人数
+     *
+     * @param merchantId
+     * @param storeId
+     * @return
      * */
     @Override
     public Integer getPayUserCount(Integer merchantId, Integer storeId) {
@@ -1237,6 +1253,10 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
     /**
      * 获取支付总金额
+     *
+     * @param merchantId
+     * @param storeId
+     * @return
      * */
     @Override
     public BigDecimal getPayMoney(Integer merchantId, Integer storeId) {

fuint-application/src/main/java/com/fuint/common/service/impl/PaymentServiceImpl.java

@@ -101,6 +101,8 @@ public class PaymentServiceImpl implements PaymentService {
 
     /**
      * 支付成功回调
+     *
+     * @param orderInfo
      * @return
      * */
     @Override
@@ -157,6 +159,9 @@ public class PaymentServiceImpl implements PaymentService {
 
     /**
      * 订单支付
+     *
+     * @param request
+     * @return
      * */
     @Override
     @Transactional(rollbackFor = Exception.class)

fuint-application/src/main/java/com/fuint/common/service/impl/SettlementServiceImpl.java

@@ -17,7 +17,6 @@ import com.fuint.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
@@ -165,6 +164,9 @@ public class SettlementServiceImpl implements SettlementService {
             }
         } else {
             MtStaff mtStaff = staffService.queryStaffByUserId(userInfo.getId());
+            if (mtStaff == null) {
+                mtStaff = staffService.queryStaffByMobile(userInfo.getMobile());
+            }
             if (mtStaff != null) {
                 operator = mtStaff.getRealName();
             }

fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -365,7 +365,6 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
             }
         }
 
-
         return dataList;
     }
 }

fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -135,6 +135,14 @@ public class WeixinServiceImpl implements WeixinService {
 
     /**
      * 创建支付订单
+     *
+     * @param userInfo
+     * @param orderInfo
+     * @param payAmount
+     * @param authCode
+     * @param giveAmount
+     * @param ip
+     * @param platform
      * @return
      * */
     @Override
@@ -330,6 +338,10 @@ public class WeixinServiceImpl implements WeixinService {
 
     /**
      * 获取微信绑定手机号
+     *
+     * @param encryptedData
+     * @param sessionKey
+     * @param iv
      * @return
      * */
     @Override
@@ -371,7 +383,15 @@ public class WeixinServiceImpl implements WeixinService {
     }
 
     /**
-     * 发送订阅消息
+     * 发送小程序订阅消息
+     *
+     * @param merchantId
+     * @param userId
+     * @param toUserOpenId
+     * @param key
+     * @param page
+     * @param params
+     * @param sendTime
      * @return
      * */
     @Override
@@ -446,6 +466,13 @@ public class WeixinServiceImpl implements WeixinService {
         return true;
     }
 
+    /**
+     * 发送订阅消息
+     *
+     * @param merchantId
+     * @param reqDataJsonStr
+     * @return
+     * */
     @Override
     public Boolean doSendSubscribeMessage(Integer merchantId, String reqDataJsonStr) {
         try {
@@ -472,6 +499,11 @@ public class WeixinServiceImpl implements WeixinService {
 
     /**
      * 查询支付订单
+     *
+     * @param storeId
+     * @param transactionId
+     * @param orderSn
+     * @return
      * */
     @Override
     public Map<String, String> queryPaidOrder(Integer storeId, String transactionId, String orderSn) {
@@ -502,6 +534,12 @@ public class WeixinServiceImpl implements WeixinService {
 
     /**
      * 刷卡支付
+     *
+     * @param storeId
+     * @param reqData
+     * @param ip
+     * @param platform
+     * @return
      * */
     private Map<String, String> microPay(Integer storeId, Map<String, String> reqData, String ip, String platform) {
         try {
@@ -582,6 +620,12 @@ public class WeixinServiceImpl implements WeixinService {
 
     /**
      * 小程序、公众号支付
+     *
+     * @param storeId
+     * @param reqData
+     * @param ip
+     * @param platform
+     * @return
      * */
     private Map<String, String> jsapiPay(Integer storeId, Map<String, String> reqData, String ip, String platform) {
         try {