销售订单移动端完善+排产申请添加消息

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -33,6 +33,8 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
+import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -42,26 +44,21 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.JPushServer;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.AppMessageDto;
 import com.yxt.messagecenter.api.message.MessageFeign;
-import com.yxt.messagecenter.api.messagelist.MessageListDto;
+import com.yxt.messagecenter.api.message.MessageFlowableDto;
+import com.yxt.messagecenter.api.message.MessageJsonDto;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
-import com.yxt.messagecenter.api.messagetype.MessageTypeVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 /**
@@ -110,6 +107,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     private MessageFeign messageFeign;
     @Autowired
     private MessageListFeign messageListFeign;
+    @Autowired
+    private SysProUrlFeign sysProUrlFeign;
 
     /**
      * 分页列表
@@ -374,8 +373,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-            //极光推送信息
-//            messageJpush(businessSid, ufVo.getNextNodeUserSids());
+            //极光推送
+            String msgSid = getMessage(ufVo, appMap, busVehicleApply);
             return voResultBean;
         }
         if (r == 2) {
@@ -392,71 +391,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         return rb;
     }
 
-    public void messageJpush(String businessSid, String nextSid) {
-        BusVehicleApply busVehicleApply = fetchBySid(businessSid);
-        List<String> stringList = Arrays.asList(nextSid.split(","));
-        //根据用户的sid查询用户的id
-        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(stringList);
-        List<String> stringList2 = Arrays.asList(stringList1.getData().split(","));
-        //标题、内容、消息类别key、消息类别名称、
-        String msgSid = getMessage(stringList);
-        for (int i = 0; i < stringList2.size(); i++) {
-            JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "审批中心", stringList2.get(i));
-        }
-
-
-    }
-
-    public String getMessage(List<String> list) {
-        //1、buttons:int[]{3,4,5}、taskId、taskName、procInsId、taskDefKey
-        //根据taskDefKey、流程标识、以及
-
-
-        // 1、保存消息体
-        AppMessageDto messageDto = new AppMessageDto();
-        ResultBean<List<MessageTypeVo>> messageBean = messageTypeFeign.selectAppMsgTypeList("0002");
-        if (messageBean.getSuccess() && messageBean.getData() != null) {
-            List<MessageTypeVo> typeVoList = messageBean.getData();
-            for (MessageTypeVo message : typeVoList) {
-                if (message.getMsgType().equals("审批中心")) {
-                    messageDto.setMsgTypeSid(message.getMsgTypeSid());
-                    messageDto.setMsgType(message.getMsgType());
-                }
-            }
-        }
-        messageDto.setMsgTitle("排产申请审批");
-        messageDto.setMsgContent("排产申请审批");
-        messageDto.setMsgSource("排产");
-        String msgSid = messageFeign.saveOrUpdateAppMessage(messageDto).getData();
-        String msgTypeSid = messageDto.getMsgTypeSid();
-        // 2、保存至消息列表
-        // 使用多线程保存
-        List<Future<?>> futures = new ArrayList<Future<?>>();
-        ExecutorService executor = Executors.newFixedThreadPool(4);
-        for (String receverSid : list) {
-            Future<?> f = executor.submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        System.out.println("run start-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
-                        MessageListDto messageList = new MessageListDto();
-                        messageList.setMsgSid(msgSid);
-                        messageList.setRDelStatus(0);
-                        messageList.setSDelStatus(0);
-                        messageList.setReceiverSid(receverSid);
-                        messageListFeign.save(messageList);
-                        System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-            futures.add(f);
-        }
-        executor.shutdown();
-        return msgSid;
-    }
-
     /**
      * 判断提交的流程是否被允许
      *
@@ -503,8 +437,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
-        BusVehicleApply busVehicleApply = fetchBySid(bv.getBusinessSid());
+        String businessSid = bv.getBusinessSid();
+        BusVehicleApply busVehicleApply = fetchBySid(businessSid);
         Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
         //根据业务sid查询排产信息
         variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
         bv.setFormVariables(variables);
@@ -513,6 +451,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             //ToDo:排产申请通过厂家认款推送
             //查询是否是最后一个环节，若状态为通过，需要打款的推送打款状态为未打款厂家认款记录；无需打款的，直接推送打款状态为无需打款的厂家认款记录。
@@ -567,8 +506,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setBusSid(r.getData());
                     finPaymentrecordFeign.save(finPaymentrecordDto);
                 }
-
             }
+            String msgSid = getMessage(ufVo, appMap, busVehicleApply);
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
@@ -632,11 +571,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
      */
     public ResultBean taskReject(BusVehicleApplyTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        BusVehicleApply busVehicleApply = fetchBySid(query.getBusinessSid());
+        String businessSid = query.getBusinessSid();
+        BusVehicleApply busVehicleApply = fetchBySid(businessSid);
         if (busVehicleApply == null) {
             return rb.setMsg("该申请不存在");
         }
-
         String businessTaskId = busVehicleApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
             if (businessTaskId.equals(query.getTaskId())) {
@@ -649,6 +588,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
+                Map<String, Object> appMap = new HashMap<>();
+                appMap.put("sid", businessSid);
+                variables.put("app", appMap);
                 //根据业务sid查询排产信息
                 variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
                 flowTaskVo.setValues(variables);
@@ -656,9 +598,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
                 }
-                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                Map<String, Object> map = BeanUtil.beanToMap(ufVo);
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+                String msgSid = getMessage(ufVo, appMap, busVehicleApply);
                 return rb.success();
             }
         }
@@ -766,4 +710,53 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         vo.setPlateThicknessSize("底  " + vo.getPlateThicknessBottom() + "  mm,边  " + vo.getPlateThicknessEdge() + "  mm");
         return rb.success().setData(vo);
     }
+
+    /**
+     * 排产申请极光推送-移动端
+     *
+     * @param ufVo
+     * @param appMap
+     * @param busVehicleApply
+     * @return
+     */
+    public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusVehicleApply busVehicleApply) {
+        //=====极光推送信息========================================参数组装
+        List<String> receiveSidList = Arrays.asList(ufVo.getNextNodeUserSids().split(","));
+        //根据用户的sid查询用户的id
+        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
+        List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));
+        MessageFlowableDto messageFlowableDto = new MessageFlowableDto();
+        MessageJsonDto messageJsonDto = new MessageJsonDto();
+        BeanUtil.copyProperties(ufVo, messageJsonDto);
+        //查询流程审批的页面操作地址组装json的参数
+        //根据taskDef和移动端标识
+        ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.VEHICLEAPPLY.getProDefId(), ufVo.getTaskDefKey(), "1", "2");
+        SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
+        messageFlowableDto.setBusinessSid(busVehicleApply.getSid());
+        messageFlowableDto.setApp_type("2");
+        if (sysProUrlVo.getUrl().contains("#")) {
+            messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
+            List<Integer> codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
+            int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray();
+            ;
+            messageJsonDto.setButtons(ints);
+        } else {
+            messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());
+        }
+        messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
+        messageJsonDto.setTaskName(ufVo.getNodeState());
+        messageJsonDto.setProcInsId(ufVo.getProcInsId());
+        messageJsonDto.setAppMap(appMap);
+        messageFlowableDto.setJson(messageJsonDto);
+        messageFlowableDto.setList(receiveSidList);
+        messageFlowableDto.setReceiveIdList(reveiveIdList);
+        messageFlowableDto.setModuleName("排产申请");
+        messageFlowableDto.setMsgContent("排产申请");
+        messageFlowableDto.setMsgTitle("排产申请");
+        messageFlowableDto.setCreateName(busVehicleApply.getCreateByName());
+        ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);
+        String msgSid = stringResultBean.getData();
+        return msgSid;
+
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -115,10 +115,12 @@ public interface BusSalesOrderFeign {
 
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
+    @ResponseBody
     ResultBean<List<BusSaleOrderNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap BusSaleOrderNodeQuery query);
 
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")
+    @ResponseBody
     ResultBean<List<BusSaleOrderNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BusSaleOrderNodeQuery query);
 
     /*-------------------------------------App销售订单接口------------------------------------------------*/

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java

@@ -61,4 +61,13 @@ public class AppBusSaleOrderStateVo implements Vo {
     @ApiModelProperty("客户名称")
     private String customerName;
 
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("流程id")
+    private String procInsId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java

@@ -25,4 +25,6 @@ public class AppOrderDepositInfoVo implements Vo {
 
     @ApiModelProperty(value = "订金sid:后端内部使用")
     private String sid;
+    @ApiModelProperty(value = "订金交纳方式")
+    private String type;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -65,4 +65,18 @@ public class AppOrderDetailsVo implements Vo {
 
     @ApiModelProperty(value = "销售部门sid")
     private String orgSid;
+
+    @ApiModelProperty("是否有保险信息")
+    private Boolean insuranceState;
+
+    @ApiModelProperty("是否有保险说明")
+    private Boolean remarksState;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/flowable/BusSaleOrderNodeQuery.java

@@ -20,4 +20,5 @@ public class BusSaleOrderNodeQuery implements Query {
     private String taskDefKey;
     @ApiModelProperty(value = "业务sid")
     private String businessSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java

@@ -37,5 +37,8 @@ public class BusSalesOrderSubmitDto implements Dto {
     @ApiModelProperty(value = "数量")
     private Integer num;
 
+    @ApiModelProperty("返利备注")
+    private String remarks;
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -54,7 +54,7 @@
                case bo.isInsurance
                    when 0 then '否'
                    when 1 then '是' end                as insuranceInfo,
-               if(bo.state = '2', true, false)        as showContractBtn,
+               if(bo.nodeState = '已办结', true, false)        as showContractBtn,
                bo.nodeState is null                   as showUpdateBtn,
                bo.nodeState is null                   as showDeleteBtn,
                0                                      as showFinancialBtn
@@ -149,7 +149,11 @@
                bs.remarks,
                bs.userSid          as recommenderSid,
                bs.name             as recommender,
-               bs.distributorPrice as agencyFee
+               bs.distributorPrice as agencyFee,
+               bs.distributorName     intermediaryName,
+               bs.distributorMobile   intermediaryMobile,
+               bs.distributorSid      intermediarySid,
+               bo.customerPhoto       mobile
         from bus_sales_order bo
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
                  left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1027,6 +1027,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //单据状态
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         if (busSalesOrder != null) {
+            vo.setUserSid(busSalesOrder.getCreateBySid());
+            vo.setProcInsId(busSalesOrder.getProcInstId());
+            vo.setTaskId(busSalesOrder.getTaskId());
             vo.setOrderInfoState(1);
             //车型状态
             BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(saleOrderSid);
@@ -2092,6 +2095,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         AppOrderDetailsVo vo = new AppOrderDetailsVo();
         vo = baseMapper.getSaleOrderDetails(sid);
+        vo.setUserSid(busSalesOrder.getCreateBySid());
+        vo.setProcInsId(busSalesOrder.getProcInstId());
+        vo.setTaskId(busSalesOrder.getTaskId());
+        vo.setInsuranceState(StringUtils.isNotBlank(busSalesOrder.getIsInsurance()));
+        vo.setRemarksState(StringUtils.isNotBlank(busSalesOrder.getNotes()));
         //根据销售部门sid查询分公司名称
         ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidBySid(vo.getOrgSid());
         if (!"0".equals(resultBean.getData())) {
@@ -2380,10 +2388,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public Map<String, Object> getOrderMap(BusSalesOrder busSalesOrder) {
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("sid", busSalesOrder.getSid());
+        appMap.put("saleOrderSid", busSalesOrder.getSid());
         variables.put("app", appMap);
         //是否是全款
-        variables.put("isLoan", "01".equals(busSalesOrder.getPayTypeKey()));
+        variables.put("isLoan", "1".equals(busSalesOrder.getPayTypeKey()));
         //查询是否超权限
         BusSalesOrderPowerVo busSalesOrderPowerVo = isHavePower(busSalesOrder.getSid());
         //销售部经理是否超权限

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@@ -71,7 +71,7 @@
     </update>
 
     <select id="selectDeposit" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo">
-        select deposit, depositAll as depositTotal, sid, depositTypeKey
+        select deposit, depositAll as depositTotal, sid, depositTypeKey,depositType as type
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -260,8 +260,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                 }
             }
         }
-//        qw.eq("bd.state", 1);
-        qw.eq("bd.nodeState", FlowComment.SETTLE.getRemark());//已办结
+        qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         qw.eq("bmd.depositBillTypeKey", "01");
         return qw;
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java

@@ -11,4 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface BusSalesOrderSubmitMapper extends BaseMapper<BusSalesOrderSubmit> {
+
+    BusSalesOrderSubmit seletByOrderSid(String businessSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitMapper">
+    <select id="seletByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit">
+        select *
+        from bus_sales_order_submit
+        where salesOrderSid = #{businessSid}
+    </select>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java

@@ -18,21 +18,41 @@ import java.math.BigDecimal;
 public class BusSalesOrderSubmitService extends MybatisBaseService<BusSalesOrderSubmitMapper, BusSalesOrderSubmit> {
     public void saveOrderSubmit(BusSalesOrderSubmitDto busSalesOrderSubmitDto, String businessSid) {
         if (busSalesOrderSubmitDto != null) {
-            BusSalesOrderSubmit busSalesOrderSubmit1 = new BusSalesOrderSubmit();
-            BeanUtil.copyProperties(busSalesOrderSubmitDto, busSalesOrderSubmit1, "sid");
-            BigDecimal priceBig = new BigDecimal("0");
-            BigDecimal priceAll = new BigDecimal("0");
-            if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPrice())) {
-                priceBig = new BigDecimal(busSalesOrderSubmitDto.getDistributorPrice());
-                busSalesOrderSubmit1.setDistributorPrice(priceBig);
+            //查询该销售订单是否有提交信息
+            BusSalesOrderSubmit busSalesOrderSubmit = baseMapper.seletByOrderSid(businessSid);
+            if (busSalesOrderSubmit == null) {
+                busSalesOrderSubmit = new BusSalesOrderSubmit();
+                BeanUtil.copyProperties(busSalesOrderSubmitDto, busSalesOrderSubmit, "sid");
+                BigDecimal priceBig = new BigDecimal("0");
+                BigDecimal priceAll = new BigDecimal("0");
+                if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPrice())) {
+                    priceBig = new BigDecimal(busSalesOrderSubmitDto.getDistributorPrice());
+                    busSalesOrderSubmit.setDistributorPrice(priceBig);
 
+                }
+                if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPriceAll())) {
+                    priceAll = new BigDecimal(busSalesOrderSubmitDto.getDistributorPriceAll());
+                    busSalesOrderSubmit.setDistributorPriceAll(priceAll);
+                }
+                busSalesOrderSubmit.setSalesOrderSid(businessSid);
+                save(busSalesOrderSubmit);
+            } else {
+                BeanUtil.copyProperties(busSalesOrderSubmitDto, busSalesOrderSubmit);
+                BigDecimal priceBig = new BigDecimal("0");
+                BigDecimal priceAll = new BigDecimal("0");
+                if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPrice())) {
+                    priceBig = new BigDecimal(busSalesOrderSubmitDto.getDistributorPrice());
+                    busSalesOrderSubmit.setDistributorPrice(priceBig);
+
+                }
+                if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPriceAll())) {
+                    priceAll = new BigDecimal(busSalesOrderSubmitDto.getDistributorPriceAll());
+                    busSalesOrderSubmit.setDistributorPriceAll(priceAll);
+                }
+                busSalesOrderSubmit.setSalesOrderSid(businessSid);
+                updateById(busSalesOrderSubmit);
             }
-            if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPriceAll())) {
-                priceAll = new BigDecimal(busSalesOrderSubmitDto.getDistributorPriceAll());
-                busSalesOrderSubmit1.setDistributorPriceAll(priceAll);
-            }
-            busSalesOrderSubmit1.setSalesOrderSid(businessSid);
-            save(busSalesOrderSubmit1);
+
         }
     }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -549,10 +549,11 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             if (appSubsetVersions != null) {
                 List<Integer> integers = appVer.get(key);
                 for (int i = 0; i < integers.size(); i++) {
+                    Integer integer = integers.get(i);
                     String path = fileUploadComponent.getUrlPrefix();
-                    voList.get(i).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl());
-                    voList.get(i).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode());
-                    voList.get(i).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName());
+                    voList.get(integer).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl());
+                    voList.get(integer).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode());
+                    voList.get(integer).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName());
                 }
             }
         }
@@ -560,6 +561,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         page.setCurrent(resultBean.getData().getCurrent());
         page.setSize(resultBean.getData().getSize());
         page.setTotal(resultBean.getData().getTotal());
+        long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() -1) / resultBean.getData().getSize();
+        page.setPages(pages);
         return rb.success().setData(page);
     }
 
@@ -633,10 +636,11 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             if (appSubsetVersions != null) {
                 List<Integer> integers = appVer.get(key);
                 for (int i = 0; i < integers.size(); i++) {
+                    Integer integer = integers.get(i);
                     String path = fileUploadComponent.getUrlPrefix();
-                    voList.get(i).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl());
-                    voList.get(i).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode());
-                    voList.get(i).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName());
+                    voList.get(integer).getAppVariables().setPath(path+appSubsetVersions.getUpdateUrl());
+                    voList.get(integer).getAppVariables().setModuleVersion(appSubsetVersions.getVersionCode());
+                    voList.get(integer).getAppVariables().setModulePluginName(appSubsetVersions.getModulePluginName());
                 }
             }
         }
@@ -644,6 +648,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         page.setCurrent(resultBean.getData().getCurrent());
         page.setSize(resultBean.getData().getSize());
         page.setTotal(resultBean.getData().getTotal());
+        long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() -1) / resultBean.getData().getSize();
+        page.setPages(pages);
         return rb.success().setData(page);
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/OrderSubmitDto.java

@@ -26,6 +26,7 @@ public class OrderSubmitDto implements Dto {
     private String distributorMobile;
 
     @ApiModelProperty(value = "中介单位sid")
+    @JsonProperty("intermediarySid")
     private String distributorSid;
     @ApiModelProperty(value = "单车中介服务费")
     @JsonProperty("agencyFee")
@@ -34,6 +35,7 @@ public class OrderSubmitDto implements Dto {
     @JsonProperty("recommender")
     private String name;
     @ApiModelProperty(value = "内部引荐人sid")
+    @JsonProperty("recommenderSid")
     private String userSid;
     @ApiModelProperty(value = "数量")
     @JsonProperty("number")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java

@@ -18,4 +18,7 @@ public class OrderDepositInfoVo implements Vo {
     private String depositTotal;
     @ApiModelProperty(value = "订金备注")
     private String depositRemarks;
+
+    @ApiModelProperty(value = "订金结转方式")
+    private String type;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java

@@ -57,4 +57,17 @@ public class OrderDetailsVo implements Vo {
     @ApiModelProperty(value = "订金信息")
     private OrderDepositInfoVo depositInfo;
 
+    @ApiModelProperty("是否有保险信息")
+    private Boolean insuranceState;
+    @ApiModelProperty("是否有补充说明")
+    private Boolean remarksState;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDiscountListVo.java

@@ -17,7 +17,7 @@ public class OrderDiscountListVo implements Vo {
     @ApiModelProperty(value = "价值")
     private String price;
     @ApiModelProperty(value = "说明")
-    private String explain;
+    private String discountExplain;
     @ApiModelProperty(value = "数量")
     private String number;
     @ApiModelProperty(value = "总价值")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java

@@ -64,4 +64,14 @@ public class OrderStateVo implements Vo {
 
     @ApiModelProperty("客户名称")
     private String customerName;
+
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("流程id")
+    private String procInsId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
 }