优化-运营商结算 结算方案优化

superdesk-uniorder-dao/src/main/resources/mappers/unified/settlement/UnifiedSettlementProgrammeMapperEx.xml

@@ -12,6 +12,7 @@
             t.settlement_rule settlementRule,
             t.remark,
             t.enabled,
+            t.is_default isDefault,
             t1.fullname updateUser,
             t.update_time updateTime
         FROM unified_settlement_programme t

superdesk-uniorder-dto/src/main/java/cn/superdesk/uniorder/dto/vo/operationCenter/customer/settlement/UnifiedSettlementVo.java

@@ -26,4 +26,7 @@ public class UnifiedSettlementVo implements Serializable {
     private String updateTime;
 
     private String updateUser;
+
+    private Integer isDefault;//是否默认
+
 }

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/unified/settlement/impl/UnifiedSettlementProgrammeServiceImpl.java

@@ -95,6 +95,10 @@ public class UnifiedSettlementProgrammeServiceImpl implements UnifiedSettlementP
     @Override
     public R<String> saveUnifiedSettlement(UnifiedSettlementParam param, Long sysUserId) {
         //校验
+        if (null == param.getCustomerId() || null == param.getType()) {
+            return new R<>("500", "客户id和类型不能为空", false);
+        }
+
 
         UnifiedSettlementProgramme entity = new UnifiedSettlementProgramme();
         BeanUtils.copyProperties(param, entity);
@@ -179,6 +183,9 @@ public class UnifiedSettlementProgrammeServiceImpl implements UnifiedSettlementP
         if (null == param.getId()) {
             return new R<>("500", "id不能为空", false);
         }
+        if (null == param.getCustomerId() || null == param.getType()) {
+            return new R<>("500", "客户id和类型不能为空", false);
+        }
 
         UnifiedSettlementProgramme entity = unifiedSettlementProgrammeMapper.selectByPrimaryKey(param.getId());
         BeanUtils.copyProperties(param, entity);

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/operationCenter/base/OperationCenterBaseController.java

@@ -42,7 +42,7 @@ public class OperationCenterBaseController {
         return result;
     }
     /**
-     *订单类型
+     *订单类型(更换名称)->业务类型
      */
     @PostMapping("/orderType")
     @ResponseBody
@@ -54,7 +54,7 @@ public class OperationCenterBaseController {
     }
 
     /**
-     *业务类型
+     *业务类型(更换名称)->订单类型
      */
     @PostMapping("/orderBizType")
     @ResponseBody