优化代码

java110-bean/src/main/java/com/java110/dto/communitySpacePersonTime/CommunitySpacePersonTimeDto.java

@@ -18,6 +18,8 @@ public class CommunitySpacePersonTimeDto extends PageDto implements Serializable
     public static final String STATE_WAIT_CONFIRM = "W"; //待核销
     public static final String STATE_FINISH = "C"; // 核销完成
 
+    public static final String STATE_CL = "CL";//取消预约
+
     private String spaceId;
     private String cspId;
     private String[] cspIds;

java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml

@@ -69,9 +69,7 @@
         <if test="spaceId !=null and spaceId != ''">
             , t.space_id= #{spaceId}
         </if>
-        <if test="cspId !=null and cspId != ''">
-            , t.csp_id= #{cspId}
-        </if>
+
         <if test="state !=null and state != ''">
             , t.state = #{state}
         </if>
@@ -85,6 +83,9 @@
         <if test="timeId !=null and timeId != ''">
             and t.time_id= #{timeId}
         </if>
+        <if test="cspId !=null and cspId != ''">
+            and t.csp_id= #{cspId}
+        </if>
 
     </update>
 

service-community/src/main/java/com/java110/community/cmd/communitySpace/DeleteCommunitySpacePersonCmd.java

@@ -22,13 +22,17 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto;
+import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
 import com.java110.dto.onlinePay.OnlinePayDto;
 import com.java110.intf.acct.IOnlinePayV1InnerServiceSMO;
+import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO;
 import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO;
 import com.java110.po.communitySpacePerson.CommunitySpacePersonPo;
+import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo;
 import com.java110.po.onlinePay.OnlinePayPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,6 +60,9 @@ public class DeleteCommunitySpacePersonCmd extends Cmd {
     @Autowired
     private IOnlinePayV1InnerServiceSMO onlinePayV1InnerServiceSMOImpl;
 
+    @Autowired
+    private ICommunitySpacePersonTimeV1InnerServiceSMO communitySpacePersonTimeV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "cspId", "cspId不能为空");
@@ -77,6 +84,15 @@ public class DeleteCommunitySpacePersonCmd extends Cmd {
 
         returnOnlinePayMoney(communitySpacePersonDtos);
 
+        if(!StringUtil.isEmpty(communitySpacePersonDtos.get(0).getOrderId()) &&
+                !"-1".equals(communitySpacePersonDtos.get(0).getOrderId())){
+            communitySpacePersonDto = new CommunitySpacePersonDto();
+            communitySpacePersonDto.setOrderId(communitySpacePersonDtos.get(0).getOrderId());
+            communitySpacePersonDto.setState(CommunitySpacePersonDto.STATE_S);
+            communitySpacePersonDtos = communitySpacePersonV1InnerServiceSMOImpl.queryCommunitySpacePersons(communitySpacePersonDto);
+
+        }
+
         for (CommunitySpacePersonDto communitySpacePersonDto1 : communitySpacePersonDtos) {
             CommunitySpacePersonPo communitySpacePersonPo = new CommunitySpacePersonPo();
             communitySpacePersonPo.setCspId(communitySpacePersonDto1.getCspId());
@@ -86,6 +102,12 @@ public class DeleteCommunitySpacePersonCmd extends Cmd {
             if (flag < 1) {
                 throw new CmdException("删除数据失败");
             }
+
+
+            CommunitySpacePersonTimePo communitySpacePersonTimePo = new CommunitySpacePersonTimePo();
+            communitySpacePersonTimePo.setCspId(communitySpacePersonDto1.getCspId());
+            communitySpacePersonTimePo.setState(CommunitySpacePersonTimeDto.STATE_CL);
+            communitySpacePersonTimeV1InnerServiceSMOImpl.updateCommunitySpacePersonTime(communitySpacePersonTimePo);
         }