wuxw 1 год назад
Родитель
Сommit
69f13459a8

+ 145 - 0
service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/ListAdminReturnPayFeesCmd.java

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.fee.cmd.returnPayFee;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.fee.FeeAccountDetailDto;
+import com.java110.dto.onlinePayRefund.OnlinePayRefundDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
+import com.java110.dto.payFee.ReturnPayFeeDto;
+import com.java110.intf.acct.IOnlinePayRefundV1InnerServiceSMO;
+import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
+import com.java110.intf.fee.IReturnPayFeeInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述:查询
+ * 服务编码:returnPayFee.listReturnPayFee
+ * 请求路劲:/app/returnPayFee.ListReturnPayFee
+ * add by 吴学文 at 2022-02-21 12:20:03 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网:http://www.homecommunity.cn
+ * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "returnPayFee.listAdminReturnPayFees")
+public class ListAdminReturnPayFeesCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListAdminReturnPayFeesCmd.class);
+
+    @Autowired
+    private IReturnPayFeeInnerServiceSMO returnPayFeeInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeDetailDiscountInnerServiceSMO payFeeDetailDiscountInnerServiceSMOImpl;
+
+    @Autowired
+    private IOnlinePayRefundV1InnerServiceSMO onlinePayRefundV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+        super.validateAdmin(cmdDataFlowContext);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        ReturnPayFeeDto returnPayFeeDto = BeanConvertUtil.covertBean(reqJson, ReturnPayFeeDto.class);
+
+        int count = returnPayFeeInnerServiceSMOImpl.queryReturnPayFeesCount(returnPayFeeDto);
+
+        List<ReturnPayFeeDto> returnPayFees;
+
+        if (count > 0) {
+            //注意这里处理 记得测试退费逻辑
+            returnPayFees = returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto);
+            for (ReturnPayFeeDto returnPayFee : returnPayFees) {
+                FeeAccountDetailDto feeAccountDetailDto = new FeeAccountDetailDto();
+                feeAccountDetailDto.setDetailId(returnPayFee.getDetailId());
+                List<FeeAccountDetailDto> feeAccountDetailDtos = feeAccountDetailServiceSMOImpl.queryFeeAccountDetails(feeAccountDetailDto);
+                if (!ListUtil.isNull(feeAccountDetailDtos)) {
+                    returnPayFee.setFeeAccountDetailDtoList(feeAccountDetailDtos);
+                }
+                PayFeeDetailDiscountDto payFeeDetailDiscountDto = new PayFeeDetailDiscountDto();
+                payFeeDetailDiscountDto.setDetailId(returnPayFee.getDetailId());
+                List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtos = payFeeDetailDiscountInnerServiceSMOImpl.queryPayFeeDetailDiscounts(payFeeDetailDiscountDto);
+                if (!ListUtil.isNull(payFeeDetailDiscountDtos)) {
+                    returnPayFee.setPayFeeDetailDiscountDtoList(payFeeDetailDiscountDtos);
+                }
+            }
+        } else {
+            returnPayFees = new ArrayList<>();
+        }
+        //todo 查询退款 支付系统返回内容
+        computeOnlinePayRefundRemark(returnPayFees);
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, returnPayFees);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+
+    private void computeOnlinePayRefundRemark(List<ReturnPayFeeDto> returnPayFees) {
+
+        if (ListUtil.isNull(returnPayFees)) {
+            return;
+        }
+
+        List<String> detailIds = new ArrayList<>();
+        for (ReturnPayFeeDto returnPayFeeDto : returnPayFees) {
+            detailIds.add(returnPayFeeDto.getDetailId());
+        }
+
+        OnlinePayRefundDto onlinePayRefundDto = new OnlinePayRefundDto();
+        onlinePayRefundDto.setBusiIds(detailIds.toArray(new String[detailIds.size()]));
+        List<OnlinePayRefundDto> onlinePayRefundDtos = onlinePayRefundV1InnerServiceSMOImpl.queryOnlinePayRefunds(onlinePayRefundDto);
+
+        if (ListUtil.isNull(onlinePayRefundDtos)) {
+            return;
+        }
+
+        for (ReturnPayFeeDto returnPayFeeDto : returnPayFees) {
+            for (OnlinePayRefundDto tmpOnlinePayRefundDto : onlinePayRefundDtos) {
+                if (returnPayFeeDto.getDetailId().equals(tmpOnlinePayRefundDto.getBusiId())) {
+                    returnPayFeeDto.setRefundState(tmpOnlinePayRefundDto.getState());
+                    returnPayFeeDto.setRefundRemark(tmpOnlinePayRefundDto.getMessage());
+                }
+            }
+        }
+    }
+}

+ 102 - 0
service-store/src/main/java/com/java110/store/cmd/contract/QueryAdminContractCmd.java

@@ -0,0 +1,102 @@
+package com.java110.store.cmd.contract;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.contract.ContractAttrDto;
+import com.java110.dto.contract.ContractDto;
+import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
+import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
+import com.java110.intf.store.IContractAttrInnerServiceSMO;
+import com.java110.intf.store.IContractInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "contract.queryAdminContract")
+public class QueryAdminContractCmd extends Cmd {
+
+    @Autowired
+    private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+
+    @Autowired
+    private IContractAttrInnerServiceSMO contractAttrInnerServiceSMOImpl;
+
+    @Autowired
+    private IContractApplyUserInnerServiceSMO contractApplyUserInnerServiceSMOImpl;
+
+    @Autowired
+    private IContractChangeUserInnerServiceSMO contractChangeUserInnerServiceSMO;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        super.validatePageInfo(reqJson);
+        super.validateAdmin(cmdDataFlowContext);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        ContractDto contractDto = BeanConvertUtil.covertBean(reqJson, ContractDto.class);
+        contractDto.setStoreId("");
+        //如果是到期合同
+        int count = contractInnerServiceSMOImpl.queryContractsCount(contractDto);
+
+        List<ContractDto> contractDtos = null;
+        if (count > 0) {
+            contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
+            refreshAttr(contractDtos);
+        } else {
+            contractDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) contractDto.getRow()), count, contractDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+
+    /**
+     * 属性属性
+     *
+     * @param contractDtos
+     */
+    private void refreshAttr(List<ContractDto> contractDtos) {
+        List<String> contractIds = new ArrayList<>();
+        for (ContractDto contractDto : contractDtos) {
+            contractIds.add(contractDto.getContractId());
+        }
+
+
+        if (contractIds.size() < 1) {
+            return;
+        }
+
+        ContractAttrDto contractAttrDto = new ContractAttrDto();
+        contractAttrDto.setContractIds(contractIds.toArray(new String[contractIds.size()]));
+        List<ContractAttrDto> contractAttrDtos = contractAttrInnerServiceSMOImpl.queryContractAttrs(contractAttrDto);
+
+        List<ContractAttrDto> attrs = null;
+        for (ContractDto contractDto : contractDtos) {
+            attrs = new ArrayList<>();
+            for (ContractAttrDto tmpContractAttrDto : contractAttrDtos) {
+                if (contractDto.getContractId().equals(tmpContractAttrDto.getContractId())) {
+                    attrs.add(tmpContractAttrDto);
+                }
+            }
+            contractDto.setAttrs(attrs);
+        }
+
+
+    }
+}

+ 70 - 0
service-user/src/main/java/com/java110/user/cmd/user/QueryAdminStaffAppAuthCmd.java

@@ -0,0 +1,70 @@
+package com.java110.user.cmd.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.user.StaffAppAuthDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.List;
+
+@Java110Cmd(serviceCode = "user.queryAdminStaffAppAuth")
+public class QueryAdminStaffAppAuthCmd extends Cmd {
+
+    @Autowired
+    private IStaffAppAuthInnerServiceSMO staffAppAuthInnerServiceSMOImpl;
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        super.validateAdmin(context);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        StaffAppAuthDto staffAppAuthDto = BeanConvertUtil.covertBean(reqJson, StaffAppAuthDto.class);
+        staffAppAuthDto.setStoreId("");
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(staffAppAuthDto.getStaffId());
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "用户不存在");
+        staffAppAuthDto.setStaffName(userDtos.get(0).getName());
+
+        List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuths(staffAppAuthDto);
+
+        if (ListUtil.isNull(staffAppAuthDtos)) {
+            staffAppAuthDto.setStateName("未认证");
+            staffAppAuthDto.setState("1001");
+            staffAppAuthDto.setOpenId("-");
+            staffAppAuthDto.setAppType("-");
+            staffAppAuthDto.setOpenName("-");
+        } else {
+            staffAppAuthDto.setStateName("已认证");
+            staffAppAuthDto.setState("2002");
+            staffAppAuthDto.setOpenId(staffAppAuthDtos.get(0).getOpenId());
+            staffAppAuthDto.setAppType(staffAppAuthDtos.get(0).getAppType());
+            staffAppAuthDto.setOpenName(staffAppAuthDtos.get(0).getOpenName());
+            staffAppAuthDto.setCreateTime(staffAppAuthDtos.get(0).getCreateTime());
+        }
+        ResponseEntity responseEntity = ResultVo.createResponseEntity(staffAppAuthDto);
+        context.setResponseEntity(responseEntity);
+    }
+}