v3.0.8小版本迭代更新

fuint-application/src/main/java/com/fuint/common/service/ActionLogService.java

@@ -14,9 +14,10 @@ import com.fuint.repository.model.TActionLog;
 public interface ActionLogService extends IService<TActionLog> {
 
     /**
-     * 保存实体
+     * 保存日志
      *
      * @param actionLog
+     * @return
      */
     void saveActionLog(TActionLog actionLog);
 

fuint-application/src/main/java/com/fuint/common/service/AddressService.java

@@ -19,19 +19,24 @@ public interface AddressService extends IService<MtAddress> {
      *
      * @param  mtAddress
      * @throws BusinessCheckException
+     * @return
      */
     MtAddress saveAddress(MtAddress mtAddress) throws BusinessCheckException;
 
     /**
      * 根据ID获取Banner信息
      *
-     * @param id Banner ID
+     * @param id 地址ID
      * @throws BusinessCheckException
+     * @return
      */
     MtAddress detail(Integer id) throws BusinessCheckException;
 
     /**
-     * 根据条件搜索
+     * 根据条件查询地址列表
+     *
+     * @param params 查询参数
+     * @return
      * */
     List<MtAddress> queryListByParams(Map<String, Object> params) throws BusinessCheckException;
 }

fuint-application/src/main/java/com/fuint/common/service/AlipayService.java

@@ -15,12 +15,48 @@ import java.util.Map;
  */
 public interface AlipayService {
 
+    /**
+     * 创建预支付订单
+     *
+     * @param userInfo 会员信息
+     * @param orderInfo 订单信息
+     * @param payAmount 支付金额
+     * @param authCode 付款码
+     * @param giveAmount 赠送金额
+     * @param ip 支付IP地址
+     * @param platform 支付平台
+     * @return
+     * */
     ResponseObject createPrepayOrder(MtUser userInfo, MtOrder orderInfo, Integer payAmount, String authCode, Integer giveAmount, String ip, String platform) throws BusinessCheckException;
 
+    /**
+     * 支付回调
+     *
+     * @param params 请求参数
+     * @return
+     * */
     Boolean checkCallBack(Map<String, String> params) throws Exception;
 
+    /**
+     * 查询支付订单
+     *
+     * @param storeId 店铺ID
+     * @param tradeNo 交易单号
+     * @param orderSn 订单号
+     * @return
+     * */
     Map<String, String> queryPaidOrder(Integer storeId, String tradeNo, String orderSn) throws BusinessCheckException;
 
+    /**
+     * 发起售后退款
+     *
+     * @param storeId 店铺ID
+     * @param orderSn 订单号
+     * @param totalAmount 订单总金额
+     * @param refundAmount 售后金额
+     * @param platform 订单平台
+     * @return
+     * */
     Boolean doRefund(Integer storeId, String orderSn, BigDecimal totalAmount, BigDecimal refundAmount, String platform) throws BusinessCheckException;
 
 }

fuint-application/src/main/java/com/fuint/common/service/BannerService.java

@@ -42,9 +42,9 @@ public interface BannerService extends IService<MtBanner> {
     MtBanner queryBannerById(Integer id) throws BusinessCheckException;
 
     /**
-     * 根据Banner ID 删除
+     * 根据ID删除
      *
-     * @param id       ID
+     * @param id ID
      * @param operator 操作人
      * @throws BusinessCheckException
      */
@@ -59,6 +59,9 @@ public interface BannerService extends IService<MtBanner> {
 
     /**
      * 根据条件搜索Banner
+     *
+     * @param params 查询参数
+     * @return
      * */
     List<MtBanner> queryBannerListByParams(Map<String, Object> params) throws BusinessCheckException;
 

fuint-application/src/main/java/com/fuint/common/service/CateService.java

@@ -47,6 +47,7 @@ public interface CateService extends IService<MtGoodsCate> {
      * @param  id       ID
      * @param  operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void deleteCate(Integer id, String operator) throws BusinessCheckException;
 
@@ -54,11 +55,15 @@ public interface CateService extends IService<MtGoodsCate> {
      * 更新分类
      * @param  reqDto
      * @throws BusinessCheckException
+     * @return
      * */
     MtGoodsCate updateCate(MtGoodsCate reqDto) throws BusinessCheckException;
 
     /**
      * 根据条件搜索分类
+     *
+     * @param params 查询参数
+     * @return
      * */
     List<MtGoodsCate> queryCateListByParams(Map<String, Object> params) throws BusinessCheckException;
 }

fuint-application/src/main/java/com/fuint/common/service/CouponService.java

@@ -34,6 +34,7 @@ public interface CouponService extends IService<MtCoupon> {
      *
      * @param reqCouponDto
      * @throws BusinessCheckException
+     * @return
      */
     MtCoupon saveCoupon(ReqCouponDto reqCouponDto) throws BusinessCheckException, ParseException;
 
@@ -42,6 +43,7 @@ public interface CouponService extends IService<MtCoupon> {
      *
      * @param id 卡券ID
      * @throws BusinessCheckException
+     * @return
      */
     MtCoupon queryCouponById(Integer id) throws BusinessCheckException;
 
@@ -51,6 +53,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @param id       卡券ID
      * @param operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void deleteCoupon(Long id, String operator) throws BusinessCheckException;
 
@@ -71,6 +74,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @param uuid    批次号
      * @param operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void sendCoupon(Integer couponId, Integer userId, Integer num, Boolean sendMessage, String uuid, String operator) throws BusinessCheckException;
 
@@ -83,6 +87,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @param uuid     批次号
      * @param operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     Boolean batchSendCoupon(Integer couponId, List<Integer> userIds, Integer num, String uuid, String operator) throws BusinessCheckException;
 
@@ -90,6 +95,7 @@ public interface CouponService extends IService<MtCoupon> {
      * 根据分组获取卡券列表
      * @param groupId 查询参数
      * @throws BusinessCheckException
+     * @return
      * */
     List<MtCoupon> queryCouponListByGroupId(Integer groupId) throws BusinessCheckException;
 
@@ -102,6 +108,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @param amount 核销金额
      * @param remark 核销备注
      * @throws BusinessCheckException
+     * @return
      * */
     String useCoupon(Integer userCouponId, Integer userId, Integer storeId, Integer orderId, BigDecimal amount, String remark) throws BusinessCheckException;
 
@@ -111,6 +118,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @param id       券ID
      * @param operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void deleteUserCoupon(Integer id, String operator) throws BusinessCheckException;
 
@@ -121,6 +129,7 @@ public interface CouponService extends IService<MtCoupon> {
      * @param userCouponId       用户卡券ID
      * @param operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void rollbackUserCoupon(Integer id, Integer userCouponId,String operator) throws BusinessCheckException;
 
@@ -128,6 +137,7 @@ public interface CouponService extends IService<MtCoupon> {
      * 根据ID获取用户卡券信息
      * @param userCouponId 查询参数
      * @throws BusinessCheckException
+     * @return
      * */
     MtUserCoupon queryUserCouponById(Integer userCouponId) throws BusinessCheckException;
 
@@ -137,12 +147,14 @@ public interface CouponService extends IService<MtCoupon> {
      * @param uuid       批次ID
      * @param operator   操作人
      * @throws BusinessCheckException
+     * @return
      */
     void removeUserCoupon(Long id, String uuid, String operator) throws BusinessCheckException;
 
     /**
      * 判断卡券码是否过期
      * @param code 券码
+     * @return
      * */
     boolean codeExpired(String code);
 

fuint-application/src/main/java/com/fuint/common/service/DutyService.java

@@ -22,6 +22,7 @@ public interface DutyService extends IService<TDuty> {
      * 角色保存方法
      *
      * @param duty
+     * @return
      */
     void saveDuty(TDuty duty, List<TSource> sources) throws BusinessCheckException;
 
@@ -63,6 +64,7 @@ public interface DutyService extends IService<TDuty> {
      *
      * @param merchantId
      * @param dutyId
+     * @return
      */
     void deleteDuty(Integer merchantId, long dutyId) throws BusinessCheckException;
 

fuint-application/src/main/java/com/fuint/common/service/GiveService.java

@@ -34,6 +34,7 @@ public interface GiveService extends IService<MtGive> {
      *
      * @param giveParam
      * @throws BusinessCheckException
+     * @return
      */
     ResponseObject addGive(GiveParam giveParam) throws BusinessCheckException;
 
@@ -42,6 +43,7 @@ public interface GiveService extends IService<MtGive> {
      *
      * @param id ID
      * @throws BusinessCheckException
+     * @return
      */
     MtGive queryGiveById(Long id) throws BusinessCheckException;
 
@@ -50,6 +52,7 @@ public interface GiveService extends IService<MtGive> {
      *
      * @param params
      * @throws BusinessCheckException
+     * @return
      * */
     List<MtGiveItem> queryItemByParams(Map<String, Object> params) throws BusinessCheckException;
 }

fuint-application/src/main/java/com/fuint/common/service/GoodsService.java

@@ -35,6 +35,7 @@ public interface GoodsService {
      *
      * @param  reqDto
      * @throws BusinessCheckException
+     * @return
      */
     MtGoods saveGoods(MtGoods reqDto) throws BusinessCheckException;
 
@@ -43,6 +44,7 @@ public interface GoodsService {
      *
      * @param  id 商品ID
      * @throws BusinessCheckException
+     * @return
      */
     MtGoods queryGoodsById(Integer id) throws BusinessCheckException;
 
@@ -52,6 +54,7 @@ public interface GoodsService {
      * @param  merchantId
      * @param  goodsNo
      * @throws BusinessCheckException
+     * @return
      */
     MtGoods queryGoodsByGoodsNo(Integer merchantId, String goodsNo) throws BusinessCheckException;
 
@@ -60,6 +63,7 @@ public interface GoodsService {
      *
      * @param  skuNo skuNo
      * @throws BusinessCheckException
+     * @return
      * */
     MtGoodsSku getSkuInfoBySkuNo(String skuNo) throws BusinessCheckException;
 
@@ -68,6 +72,7 @@ public interface GoodsService {
      *
      * @param  id
      * @throws BusinessCheckException
+     * @return
      */
     GoodsDto getGoodsDetail(Integer id, boolean getDeleteSpec) throws InvocationTargetException, IllegalAccessException;
 
@@ -77,6 +82,7 @@ public interface GoodsService {
      * @param  id       ID
      * @param  operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void deleteGoods(Integer id, String operator) throws BusinessCheckException;
 
@@ -111,7 +117,7 @@ public interface GoodsService {
     /**
      * 更新已售数量
      *
-     * @param goodsId
+     * @param goodsId 商品ID
      * @return
      * */
     Boolean updateInitSale(Integer goodsId);
@@ -119,7 +125,7 @@ public interface GoodsService {
     /**
      * 获取选择商品列表
      *
-     * @param params
+     * @param params 查询参数
      * @return
      */
     PaginationResponse<GoodsDto> selectGoodsList(Map<String, Object> params) throws BusinessCheckException;
@@ -127,10 +133,10 @@ public interface GoodsService {
     /**
      * 获取商品销售排行榜
      *
-     * @param merchantId
-     * @param storeId
-     * @param startTime
-     * @param endTime
+     * @param merchantId 商户ID
+     * @param storeId 店铺ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      * */
     List<GoodsTopDto> getGoodsSaleTopList(Integer merchantId, Integer storeId, Date startTime, Date endTime);

fuint-application/src/main/java/com/fuint/common/service/MemberGroupService.java

@@ -51,7 +51,7 @@ public interface MemberGroupService extends IService<MtUserGroup> {
     /**
      * 根据分组ID删除分组信息
      *
-     * @param  id       分组ID
+     * @param  id 分组ID
      * @param  operator 操作人
      * @throws BusinessCheckException
      */

fuint-application/src/main/java/com/fuint/common/service/MerchantService.java

@@ -29,6 +29,7 @@ public interface MerchantService extends IService<MtMerchant> {
      *
      * @param  mtMerchant
      * @throws BusinessCheckException
+     * @return
      */
     MtMerchant saveMerchant(MtMerchant mtMerchant) throws BusinessCheckException;
 
@@ -37,6 +38,7 @@ public interface MerchantService extends IService<MtMerchant> {
      *
      * @param  id 商户ID
      * @throws BusinessCheckException
+     * @return
      */
     MtMerchant queryMerchantById(Integer id) throws BusinessCheckException;
 
@@ -45,6 +47,7 @@ public interface MerchantService extends IService<MtMerchant> {
      *
      * @param  name 商户名称
      * @throws BusinessCheckException
+     * @return
      */
     MtMerchant queryMerchantByName(String name) throws BusinessCheckException;
 
@@ -71,11 +74,15 @@ public interface MerchantService extends IService<MtMerchant> {
      * @param operator 操作人
      * @param status   状态
      * @throws BusinessCheckException
+     * @return
      */
     void updateStatus(Integer id, String operator, String status) throws BusinessCheckException;
 
     /**
      * 根据条件查询商户
+     *
+     * @param params 查询参数
+     * @return
      * */
     List<MtMerchant> queryMerchantByParams(Map<String, Object> params) throws BusinessCheckException;
 

fuint-application/src/main/java/com/fuint/common/service/MessageService.java

@@ -17,6 +17,7 @@ public interface MessageService {
      *
      * @param reqMsgDto
      * @throws BusinessCheckException
+     * @return
      */
     void addMessage(MtMessage reqMsgDto) throws BusinessCheckException;
 
@@ -25,6 +26,7 @@ public interface MessageService {
      *
      * @param msgId
      * @throws BusinessCheckException
+     * @return
      */
     void readMessage(Integer msgId) throws BusinessCheckException;
 
@@ -33,19 +35,24 @@ public interface MessageService {
      *
      * @param  msgId
      * @throws BusinessCheckException
+     * @return
      */
     void sendMessage(Integer msgId, boolean isRead) throws BusinessCheckException;
 
     /**
      * 获取最新一条未读消息
      *
+     * @param userId 会员ID
      * @throws BusinessCheckException
+     * @return
      */
     MtMessage getOne(Integer userId) throws BusinessCheckException;
 
     /**
      * 获取需要发送的消息
+     *
      * @throws BusinessCheckException
+     * @return
      * */
     List<MtMessage> getNeedSendList() throws BusinessCheckException;
 }

fuint-application/src/main/java/com/fuint/common/service/OpenGiftService.java

@@ -16,8 +16,10 @@ public interface OpenGiftService {
 
     /**
      * 获取用户的开卡赠礼
+     *
      * @param paramMap 查询参数
      * @throws BusinessCheckException
+     * @return
      * */
     ResponseObject getOpenGiftList(Map<String, Object> paramMap) throws BusinessCheckException;
 
@@ -26,6 +28,7 @@ public interface OpenGiftService {
      *
      * @param reqDto
      * @throws BusinessCheckException
+     * @return
      */
     MtOpenGift addOpenGift(MtOpenGift reqDto) throws BusinessCheckException;
 
@@ -34,6 +37,7 @@ public interface OpenGiftService {
      *
      * @param id ID
      * @throws BusinessCheckException
+     * @return
      */
     OpenGiftDto getOpenGiftDetail(Integer id) throws BusinessCheckException;
 
@@ -43,22 +47,27 @@ public interface OpenGiftService {
      * @param id       ID
      * @param operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void deleteOpenGift(Integer id, String operator) throws BusinessCheckException;
 
     /**
-     * 更新订单
+     * 更新开卡赠礼
+     *
      * @param reqDto
      * @throws BusinessCheckException
+     * @return
      * */
     MtOpenGift updateOpenGift(MtOpenGift reqDto) throws BusinessCheckException;
 
     /**
      * 开卡赠礼
-     * @param userId
-     * @param gradeId
-     * @param isNewMember
+     *
+     * @param userId 会员ID
+     * @param gradeId 会员等级
+     * @param isNewMember 是否新会员
      * @throws BusinessCheckException
+     * @return
      * */
     boolean openGift(Integer userId, Integer gradeId, boolean isNewMember) throws BusinessCheckException;
 }

fuint-application/src/main/java/com/fuint/common/service/OrderService.java

@@ -26,8 +26,10 @@ public interface OrderService extends IService<MtOrder> {
 
     /**
      * 获取用户的订单
+     *
      * @param  orderListParam
      * @throws BusinessCheckException
+     * @return
      * */
     PaginationResponse getUserOrderList(OrderListParam orderListParam) throws BusinessCheckException;
 
@@ -36,11 +38,16 @@ public interface OrderService extends IService<MtOrder> {
      *
      * @param  reqDto
      * @throws BusinessCheckException
+     * @return
      */
     MtOrder saveOrder(OrderDto reqDto) throws BusinessCheckException;
 
     /**
      * 订单提交结算
+     *
+     * @param request 请求参数
+     * @param settlementParam 结算参数
+     * @return
      * */
     Map<String, Object> doSettle(HttpServletRequest request, SettlementParam settlementParam) throws BusinessCheckException;
 
@@ -49,6 +56,7 @@ public interface OrderService extends IService<MtOrder> {
      *
      * @param  id
      * @throws BusinessCheckException
+     * @return
      */
     MtOrder getOrderInfo(Integer id) throws BusinessCheckException;
 
@@ -57,6 +65,7 @@ public interface OrderService extends IService<MtOrder> {
      *
      * @param  id
      * @throws BusinessCheckException
+     * @return
      */
     UserOrderDto getOrderById(Integer id) throws BusinessCheckException;
 
@@ -65,11 +74,13 @@ public interface OrderService extends IService<MtOrder> {
      *
      * @param  id
      * @throws BusinessCheckException
+     * @return
      */
     UserOrderDto getMyOrderById(Integer id) throws BusinessCheckException;
 
     /**
      * 取消订单
+     *
      * @param  id 订单ID
      * @return
      * */
@@ -81,6 +92,7 @@ public interface OrderService extends IService<MtOrder> {
      * @param  id       ID
      * @param  operator 操作人
      * @throws BusinessCheckException
+     * @return
      */
     void deleteOrder(Integer id, String operator) throws BusinessCheckException;
 
@@ -89,6 +101,7 @@ public interface OrderService extends IService<MtOrder> {
      *
      * @param  orderSn
      * @throws BusinessCheckException
+     * @return
      */
     UserOrderDto getOrderByOrderSn(String orderSn) throws BusinessCheckException;
 
@@ -97,6 +110,7 @@ public interface OrderService extends IService<MtOrder> {
      *
      * @param  reqDto
      * @throws BusinessCheckException
+     * @return
      * */
     MtOrder updateOrder(OrderDto reqDto) throws BusinessCheckException;
 
@@ -106,6 +120,7 @@ public interface OrderService extends IService<MtOrder> {
      * @param mtOrder
      * @return
      * @throws BusinessCheckException
+     * @return
      * */
     MtOrder updateOrder(MtOrder mtOrder) throws BusinessCheckException;
 
@@ -122,7 +137,7 @@ public interface OrderService extends IService<MtOrder> {
      * 根据条件搜索订单
      *
      * @param params
-     * @retyurn
+     * @return
      * */
     List<MtOrder> getOrderListByParams(Map<String, Object> params) throws BusinessCheckException;
 
@@ -148,6 +163,7 @@ public interface OrderService extends IService<MtOrder> {
 
     /**
      * 计算购物车
+     *
      * @param merchantId 商户ID
      * @param userId 会员ID
      * @param cartList 购物车列表

fuint-application/src/main/java/com/fuint/common/service/PaymentService.java

@@ -5,7 +5,6 @@ import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.model.MtOrder;
 import com.fuint.repository.model.MtUser;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -18,17 +17,32 @@ import java.util.Map;
 public interface PaymentService {
 
     /**
-     * 创建支付单
+     * 创建预支付订单
+     *
+     * @param userInfo 会员信息
+     * @param orderInfo 订单信息
+     * @param payAmount 支付金额
+     * @param authCode 付款码
+     * @param giveAmount 赠送金额
+     * @param ip 支付IP地址
+     * @param platform 支付平台
+     * @return
      * */
     ResponseObject createPrepayOrder(MtUser userInfo, MtOrder orderInfo, Integer payAmount, String authCode, Integer giveAmount, String ip, String platform) throws BusinessCheckException;
 
     /**
      * 支付回调
+     *
+     * @param orderInfo 订单信息
+     * @return
      * */
     Boolean paymentCallback(UserOrderDto orderInfo) throws BusinessCheckException;
 
     /**
      * 订单支付
+     *
+     * @param request 请求参数
+     * @return
      * */
     Map<String, Object> doPay(HttpServletRequest request) throws BusinessCheckException;
 

fuint-application/src/main/java/com/fuint/common/service/PointService.java

@@ -28,6 +28,7 @@ public interface PointService extends IService<MtPoint> {
      *
      * @param  reqPointDto
      * @throws BusinessCheckException
+     * @return
      */
     void addPoint(MtPoint reqPointDto) throws BusinessCheckException;
 
@@ -39,6 +40,7 @@ public interface PointService extends IService<MtPoint> {
      * @param amount
      * @param remark
      * @throws BusinessCheckException
+     * @return
      */
     boolean doGift(Integer userId, String mobile, Integer amount, String remark) throws BusinessCheckException;
 }

fuint-application/src/main/java/com/fuint/common/service/RefundService.java

@@ -8,7 +8,6 @@ import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.framework.web.ResponseObject;
 import com.fuint.repository.model.MtRefund;
-
 import java.util.Date;
 import java.util.Map;
 

fuint-application/src/main/java/com/fuint/common/service/SendSmsService.java

@@ -4,7 +4,6 @@ import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.repository.model.MtSmsSendedLog;
-
 import java.util.List;
 import java.util.Map;
 

fuint-application/src/main/java/com/fuint/common/service/StoreService.java

@@ -88,10 +88,10 @@ public interface StoreService extends IService<MtStore> {
     /**
      * 根据距离远近查找店铺
      *
-     * @param merchantNo
-     * @param keyword
-     * @param latitude
-     * @param longitude
+     * @param merchantNo 商户号
+     * @param keyword 关键字
+     * @param latitude 维度
+     * @param longitude 经度
      * @return
      * */
     List<MtStore> queryByDistance(String merchantNo, String keyword, String latitude, String longitude) throws BusinessCheckException;

fuint-application/src/main/java/com/fuint/common/service/UserCouponService.java

@@ -96,10 +96,10 @@ public interface UserCouponService extends IService<MtUserCoupon> {
     /**
      * 给会员发送卡券（会员购买）
      *
-     * @param orderId
-     * @param couponId
-     * @param userId
-     * @param mobile
+     * @param orderId 订单ID
+     * @param couponId 卡券ID
+     * @param userId 会员ID
+     * @param mobile 会员手机号
      * @return
      * */
     boolean buyCouponItem(Integer orderId, Integer couponId, Integer userId, String mobile) throws BusinessCheckException;

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

@@ -33,6 +33,7 @@ public class AddressServiceImpl extends ServiceImpl<MtAddressMapper, MtAddress>
      *
      * @param mtAddress
      * @throws BusinessCheckException
+     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -83,14 +84,21 @@ public class AddressServiceImpl extends ServiceImpl<MtAddressMapper, MtAddress>
     /**
      * 根据ID获取收货地址
      *
-     * @param id
+     * @param  id 地址ID
      * @throws BusinessCheckException
+     * @return
      */
     @Override
     public MtAddress detail(Integer id) {
         return mtAddressMapper.selectById(id);
     }
 
+    /**
+     * 根据条件查询地址列表
+     *
+     * @param params 查询参数
+     * @return
+     * */
     @Override
     public List<MtAddress> queryListByParams(Map<String, Object> params) {
         Map<String, Object> param = new HashMap<>();

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

@@ -53,7 +53,15 @@ public class AlipayServiceImpl implements AlipayService {
     private StoreService storeService;
 
     /**
-     * 创建支付订单
+     * 创建预支付订单
+     *
+     * @param userInfo 会员信息
+     * @param orderInfo 订单信息
+     * @param payAmount 支付金额
+     * @param authCode 付款码
+     * @param giveAmount 赠送金额
+     * @param ip 支付IP地址
+     * @param platform 支付平台
      * @return
      * */
     @Override
@@ -120,6 +128,12 @@ public class AlipayServiceImpl implements AlipayService {
         return responseObject;
     }
 
+    /**
+     * 支付回调
+     *
+     * @param params 请求参数
+     * @return
+     * */
     @Override
     public Boolean checkCallBack(Map<String, String> params) throws Exception {
         String orderSn = params.get("out_trade_no") != null ? params.get("out_trade_no") : "";
@@ -134,6 +148,9 @@ public class AlipayServiceImpl implements AlipayService {
 
     /**
      * 获取支付配置
+     *
+     * @param storeId 店铺ID
+     * @return
      * */
     public AliPayApiConfig getApiConfig(Integer storeId) throws BusinessCheckException {
         AliPayApiConfig aliPayApiConfig;
@@ -166,6 +183,11 @@ public class AlipayServiceImpl implements AlipayService {
 
     /**
      * 查询支付订单
+     *
+     * @param storeId 店铺ID
+     * @param tradeNo 交易单号
+     * @param orderSn 订单号
+     * @return
      * */
     @Override
     public Map<String, String> queryPaidOrder(Integer storeId, String tradeNo, String orderSn) throws BusinessCheckException {
@@ -197,13 +219,13 @@ public class AlipayServiceImpl implements AlipayService {
     }
 
     /**
-     * 支付宝发起退款
+     * 发起售后退款
      *
-     * @param storeId
-     * @param orderSn
-     * @param totalAmount
-     * @param refundAmount
-     * @param platform
+     * @param storeId 店铺ID
+     * @param orderSn 订单号
+     * @param totalAmount 订单总金额
+     * @param refundAmount 售后金额
+     * @param platform 订单平台
      * @return
      * */
     public Boolean doRefund(Integer storeId, String orderSn, BigDecimal totalAmount, BigDecimal refundAmount, String platform) throws BusinessCheckException {

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

@@ -13,6 +13,7 @@ import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.repository.mapper.MtCommissionLogMapper;
 import com.fuint.common.enums.StatusEnum;
 
+import com.fuint.repository.mapper.MtOrderGoodsMapper;
 import com.fuint.repository.model.*;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
@@ -43,6 +44,8 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
 
     private MtCommissionLogMapper mtCommissionLogMapper;
 
+    private MtOrderGoodsMapper mtOrderGoodsMapper;
+
     /**
      * 订单服务接口
      * */
@@ -118,7 +121,7 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
     }
 
     /**
-     * 添加分销提成记录
+     * 新增分销提成记录
      *
      * @param orderId
      * @return
@@ -129,6 +132,18 @@ public class CommissionLogServiceImpl extends ServiceImpl<MtCommissionLogMapper,
     public void addCommissionLog(Integer orderId) {
         if (orderId != null && orderId > 0) {
             MtOrder mtOrder = orderService.getById(orderId);
+            // 商品订单佣金计算
+            if (mtOrder.getType().equals(OrderTypeEnum.GOOGS.getKey())) {
+                Map<String, Object> params = new HashMap<>();
+                params.put("ORDER_ID", mtOrder.getId());
+                params.put("STATUS", StatusEnum.ENABLED.getKey());
+                List<MtOrderGoods> goodsList = mtOrderGoodsMapper.selectByMap(params);
+                if (goodsList != null && goodsList.size() > 0) {
+                    for (MtOrderGoods orderGoods : goodsList) {
+                         orderGoods.getGoodsId();
+                    }
+                }
+            }
             if (mtOrder != null) {
                 MtCommissionLog mtCommissionLog = new MtCommissionLog();
                 mtCommissionLog.setType(mtOrder.getType());

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

@@ -72,7 +72,15 @@ public class PaymentServiceImpl implements PaymentService {
     private OpenGiftService openGiftService;
 
     /**
-     * 创建支付订单
+     * 创建预支付订单
+     *
+     * @param userInfo 会员信息
+     * @param orderInfo 订单信息
+     * @param payAmount 支付金额
+     * @param authCode 付款码
+     * @param giveAmount 赠送金额
+     * @param ip 支付IP地址
+     * @param platform 支付平台
      * @return
      * */
     @Override
@@ -95,7 +103,7 @@ public class PaymentServiceImpl implements PaymentService {
     /**
      * 支付成功回调
      *
-     * @param orderInfo
+     * @param orderInfo 订单信息
      * @return
      * */
     @Override

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPayController.java

@@ -1,7 +1,6 @@
 package com.fuint.module.clientApi.controller;
 
 import com.alipay.api.AlipayApiException;
-import com.fuint.common.bean.WxPayBean;
 import com.fuint.common.dto.*;
 import com.fuint.common.enums.OrderStatusEnum;
 import com.fuint.common.enums.SettingTypeEnum;
@@ -44,8 +43,6 @@ public class ClientPayController extends BaseController {
 
     private static final Logger logger = LoggerFactory.getLogger(ClientPayController.class);
 
-    WxPayBean wxPayBean;
-
     /**
      * 微信服务接口
      * */