Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

service-acct/src/main/java/com/java110/acct/payment/adapt/bbgpay/BbgPaymentFactoryAdapt.java

@@ -49,7 +49,9 @@ import java.util.*;
  * INSERT INTO `TT`.`community_setting_key` (`key_id`, `setting_type`, `setting_name`, `setting_key`, `remark`, `create_time`, `status_cd`)
  * VALUES ('88', '9070', 'productNo_SM4', 'productNo_SM4', 'productNo_SM4', '2021-10-10 21:25:46', '0');
  * INSERT INTO `TT`.`community_setting_key` (`key_id`, `setting_type`, `setting_name`, `setting_key`, `remark`, `create_time`, `status_cd`)
- * VALUES ('83', '9070', 'publicKey_SM4', 'publicKey_SM4', '值请填写1 私钥 请填写在备注中', '2021-10-10 21:25:46', '0');
+ * VALUES ('83', '9070', 'publicKey_SM4', 'publicKey_SM4', '值请填写 公钥 ', '2021-10-10 21:25:46', '0');
+ * INSERT INTO `TT`.`community_setting_key` (`key_id`, `setting_type`, `setting_name`, `setting_key`, `remark`, `create_time`, `status_cd`)
+ *   VALUES ('84', '9070', 'privateKey_SM4', 'privateKey_SM4', '值请填写 私钥 ', '2021-10-10 21:25:46', '0');
  * // 以下数据先查询是否存在 存在则修改 不存在添加
  * INSERT INTO `TT`.`c_mapping` (`domain`, `name`, `key`, `value`, `remark`, `create_time`, `status_cd`)
  * VALUES ('WECHAT', '被扫支付厂家', 'PAY_QR_ADAPT', 'qrCodeBbgPaymentAdapt', '', '2023-02-18 18:47:14', '0');
@@ -176,7 +178,7 @@ public class BbgPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         params.put("mcht_no", mchtNo_SM4);// 收款商户编号
         params.put("product_no", productNo_SM4);// 产品编号
         params.put("biz_type", "WX_GZH");// 业务类型
-        params.put("tran_no", String.valueOf(System.nanoTime()));// 商户流水
+        params.put("tran_no", orderNum);// 商户流水
         params.put("code", "");// 授权码
         params.put("openid", openid);// 用户标识id
         params.put("appid", smallWeChatDto.getAppId());// 公众号appid
@@ -186,9 +188,14 @@ public class BbgPaymentFactoryAdapt implements IPaymentFactoryAdapt {
         params.put("asyn_url", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));// 通知地址
         String decryParams = EncryptDecryptFactory.execute(smallWeChatDto.getObjId(), gzhPayUrl, params);
         JSONObject paramOut = JSONObject.parseObject(decryParams);
+        if (!"SUCCESS".equals(paramOut.getString("status"))
+                        || !"SUCCESS".equals(paramOut.getString("deal_status"))) {
+            throw new IllegalArgumentException("支付失败" + paramOut.getString("return_message"));
+        }
+
         if (!"0000".equals(paramOut.getString("return_code"))
-                || !"SUCCESS".equals(paramOut.getString("status"))
-                || !"SUCCESS".equals(paramOut.getString("deal_status"))) {
+                && !"0001".equals(paramOut.getString("return_code"))
+        ) {
             throw new IllegalArgumentException("支付失败" + paramOut.getString("return_message"));
         }
         SortedMap<String, String> resultMap = new TreeMap<String, String>();
@@ -240,7 +247,7 @@ public class BbgPaymentFactoryAdapt implements IPaymentFactoryAdapt {
 
         JSONObject resJson = new JSONObject();
         resJson.put("return_code", "SUCCESS");
-        resJson.put("return_code", "成功");
+        resJson.put("return message", "成功");
 
         paymentOrderDto.setResponseEntity(new ResponseEntity<String>(resJson.toJSONString(), HttpStatus.OK));
         return paymentOrderDto;

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java

@@ -103,7 +103,7 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
         List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
 
         Assert.listOnlyOne(tmpFeeDtos, "费用不存在");
-
+        feeDto = tmpFeeDtos.get(0);
         //todo 查询 缴费明细
         FeeDetailDto feeDetailDto = new FeeDetailDto();
         feeDetailDto.setCommunityId(feeDto.getCommunityId());

service-store/src/main/java/com/java110/store/cmd/property/DeletePropertyCmd.java

@@ -24,12 +24,17 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.doc.annotation.*;
 import com.java110.dto.CommunityMemberDto;
+import com.java110.dto.store.StoreUserDto;
 import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
+import com.java110.intf.store.IStoreUserV1InnerServiceSMO;
 import com.java110.intf.store.IStoreV1InnerServiceSMO;
 import com.java110.intf.user.IMenuGroupCommunityV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.community.CommunityMemberPo;
 import com.java110.po.menuGroupCommunity.MenuGroupCommunityPo;
 import com.java110.po.store.StorePo;
+import com.java110.po.store.StoreUserPo;
+import com.java110.po.user.UserPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -85,12 +90,18 @@ public class DeletePropertyCmd extends Cmd {
     @Autowired
     private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+
     @Autowired
     private ICommunityMemberV1InnerServiceSMO communityMemberV1InnerServiceSMOImpl;
 
     @Autowired
     private IMenuGroupCommunityV1InnerServiceSMO menuGroupCommunityV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Environment.isDevEnv();
@@ -110,6 +121,9 @@ public class DeletePropertyCmd extends Cmd {
             throw new CmdException("删除数据失败");
         }
 
+        // todo 删除 物业下的所有员工数据
+        deleteStaff(storePo);
+
         CommunityMemberDto communityMemberDto = new CommunityMemberDto();
         communityMemberDto.setMemberId(storePo.getStoreId());
         List<CommunityMemberDto> communityMemberDtos = communityMemberV1InnerServiceSMOImpl.queryCommunityMembers(communityMemberDto);
@@ -139,4 +153,26 @@ public class DeletePropertyCmd extends Cmd {
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
+
+    /**
+     * 删除 员工信息
+     * @param storePo
+     */
+    private void deleteStaff(StorePo storePo) {
+        StoreUserDto storeUserDto = new StoreUserDto();
+        storeUserDto.setStoreId(storePo.getStoreId());
+        List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
+        if(storeUserDtos == null || storeUserDtos.size() < 1){
+            return;
+        }
+        StoreUserPo storeUserPo = new StoreUserPo();
+        storeUserPo.setStoreId(storePo.getStoreId());
+        storeUserV1InnerServiceSMOImpl.deleteStoreUser(storeUserPo);
+        UserPo userPo = null;
+        for(StoreUserDto staff : storeUserDtos){
+            userPo = new UserPo();
+            userPo.setUserId(staff.getUserId());
+            userV1InnerServiceSMOImpl.deleteUser(userPo);
+        }
+    }
 }