添加是否分账

fs-service/src/main/java/com/fs/hisStore/mapper/FsStorePaymentScrmMapper.java

@@ -190,8 +190,9 @@ public interface FsStorePaymentScrmMapper
     List<FsStorePaymentVO> exportFsStorePaymentList(@Param("maps") FsStorePaymentParam fsStorePayment);
 
     @Select({"<script> " +
-            "select p.*,c.company_name,d.dept_name,u.phone as user_phone,cu.nick_name as company_user_nick_name,cu.user_name as company_user_name,os.order_code  from fs_store_payment_scrm p " +
+            "select p.*,c.company_name,d.dept_name,u.phone as user_phone,cu.nick_name as company_user_nick_name,cu.user_name as company_user_name,os.order_code,case when di.pay_code is not null then 1 else 0 end is_pay_div from fs_store_payment_scrm p " +
             "left join fs_store_order_scrm os on os.id = p.order_id "+
+            "left join company_div_item di on di.pay_code=p.pay_code "+
             "left join company_user cu on p.company_user_id=cu.user_id left join fs_user u on u.user_id=p.user_id left join company_dept d on d.dept_id=p.dept_id left join company c on c.company_id=p.company_id  " +
             "where 1=1 " +
             "<if test = 'maps.payCode != null and  maps.payCode !=\"\"    '> " +

fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderOtherPayParam.java

@@ -17,5 +17,7 @@ public class FsStoreOrderOtherPayParam implements Serializable
     @NotNull(message = "code")
     private String code;
 
+    private String appId;
+
 
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStorePaymentVO.java

@@ -61,6 +61,10 @@ public class FsStorePaymentVO implements Serializable
     @Excel(name = "支付状态 0未支付 1已支付 -1 已退款",dictType = "store_payment_status")
     private Integer status;
 
+    // 是否分账
+    @Excel(name = "是否分账 0否 1是",dictType = "is_pay_div")
+    private Integer isPayDiv;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "下单金额", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -735,12 +735,12 @@ public class StoreOrderScrmController extends AppBaseController {
             storePayment.setCreateTime(new Date());
             storePayment.setPayTypeCode("weixin");
             storePayment.setBusinessType(2);
-            storePayment.setRemark("商城订单支付");
+            storePayment.setRemark("商城订单支付-亲友支付");
             storePayment.setOpenId(session.getOpenid());
             storePayment.setUserId(user.getUserId());
             storePayment.setBusinessOrderId(order.getId().toString());
             storePayment.setOrderId(order.getId());
-//            storePayment.setAppId(para);
+            storePayment.setAppId(param.getAppId());
             fsStorePaymentMapper.insertFsStorePayment(storePayment);
 
             if (fsPayConfig.getType().equals("hf")){
@@ -750,6 +750,14 @@ public class StoreOrderScrmController extends AppBaseController {
                 o.setReqSeqId("store-"+storePayment.getPayCode());
                 o.setTransAmt(storePayment.getPayMoney().toString());
                 o.setGoodsDesc("商城订单支付");
+
+                try {
+                    HuiFuUtils.doDiv(o,order.getCompanyId());
+                    //存储分账明细
+                    HuiFuUtils.saveDivItem(o, order.getOrderCode(), storePayment.getPayCode());
+                } catch (Exception e) {
+                    logger.error("-------------分账出错：{}", e.getMessage());
+                }
                 HuifuCreateOrderResult result = huiFuService.createOrder(o);
                 if(result.getResp_code()!=null&&(result.getResp_code().equals("00000000")||result.getResp_code().equals("00000100"))){