exit 修改票提

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileAgentVo.java

@@ -47,14 +47,6 @@ public class SmileAgentVo implements Serializable, Cloneable{
     @ApiModelProperty(value = "普代票提")
     private BigDecimal ordCarry;
 
-    public BigDecimal getTotalCarry() {
-        return totalCarry!=null?this.totalCarry:BigDecimal.valueOf(0);
-    }
-
-    public BigDecimal getOrdCarry() {
-        return ordCarry!=null?this.ordCarry:BigDecimal.valueOf(0);
-    }
-
     private static final SmileAgentVo obj = new SmileAgentVo();
     public static SmileAgentVo getNew() {
         try {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileAgentServiceImpl.java

@@ -38,36 +38,40 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
 
     @Override
     public AjaxResult create(List<SmileAgent> smileAgents) {
+        boolean result = true;
         if (StringUtils.isNotEmpty(smileAgents)) {
-            int count = smileAgents.size();
             for (SmileAgent agent : smileAgents) {
-                if (StringUtils.isEmpty(agent.getPerformanceId()) && StringUtils.isEmpty(agent.getTicketId())) {
-                    return AjaxResult.error();
-                }
+                result = !StringUtils.isEmpty(agent.getPerformanceId()) && !StringUtils.isEmpty(agent.getTicketId());
             }
-            for (SmileAgent smileAgent : smileAgents) {
-                SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId());
-                if (agent != null) {
-                    log.info("SmileAgent:{}", agent);
-                    continue;
-                }
-                count = count - 1;
-                SmileAgentVo smileAgentVo = SmileAgentVo.getNew();
-                smileAgentVo.copy(smileAgent);
-                if ((smileAgent.getTotalCarry() == null && smileAgent.getOrdCarry() == null) ||
-                        (smileAgent.getOrdCarry().equals(BigDecimal.valueOf(0)) && smileAgent.getTotalCarry().equals(BigDecimal.valueOf(0)))) {
-                    continue;
+            if (result) {
+                try {
+                    for (SmileAgent smileAgent : smileAgents){
+                        SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId());
+                        if (agent!=null){
+                            log.info("SmileAgent:{}",agent);
+                            //修改过票提则无法再次修改
+                            return AjaxResult.warn("票提一但设置，无法修改！");
+                        }
+                    }
+                    smileAgents.forEach(smileAgent -> {
+                        //是否是修改票提
+                        smileAgentMapper.updateAgentById(smileAgent.getId(),smileAgent.getTotalCarry().divide(BigDecimal.valueOf(100)),smileAgent.getOrdCarry().divide(BigDecimal.valueOf(100)));
+                        SmileAgentVo smileAgentVo = new SmileAgentVo();
+                        BeanUtils.copyProperties(smileAgent, smileAgentVo);
+                        smileRedisUtils.setAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId(), smileAgentVo);
+                        log.debug("create create Agent id：{},PerformanceId:{},TicketId:{}",
+                                smileAgent.getId(),
+                                smileAgent.getPerformanceId(),
+                                smileAgent.getTicketId());
+                    });
+                    return AjaxResult.success();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return AjaxResult.warn("请重试");
                 }
-                smileAgentMapper.updateAgentById(smileAgentVo.getId(), smileAgentVo.getTotalCarry(), smileAgentVo.getOrdCarry());
-
-                smileRedisUtils.setAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId(), smileAgentVo);
-            }
-            if (count==smileAgents.size()){
-                return AjaxResult.warn("票提一但设置，无法修改！");
             }
-            return AjaxResult.success();
         }
-        return AjaxResult.error();
+        return AjaxResult.success();
     }
 
     @Override