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

Your Name

2023-07-03 2b919980a8c70554a64cb3d03cc95679af4d817f

 service-api/src/main/java/com/java110/api/smo/payment/impl/ToPaySMOImpl.java

@@ -2,24 +2,29 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.dto.app.AppDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.AppAbstractComponentSMO;
import com.java110.api.smo.payment.IToPaySMO;
import com.java110.api.smo.payment.adapt.IPayAdapt;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.app.AppDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.wechat.SmallWeChatDto;
import com.java110.intf.acct.IAccountDetailInnerServiceSMO;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -27,15 +32,15 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;

import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

@Service("toPaySMOImpl")
public class ToPaySMOImpl extends AppAbstractComponentSMO implements IToPaySMO {

    private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);




    @Autowired
    private RestTemplate restTemplate;
@@ -43,9 +48,17 @@
    @Autowired
    private RestTemplate outRestTemplate;


    @Autowired
    private WechatAuthProperties wechatAuthProperties;

    @Autowired
    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;

    @Autowired
    private IAccountDetailInnerServiceSMO accountDetailInnerServiceSMOImpl;

    @Autowired
    private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;

    @Override
    public ResponseEntity<String> toPay(IPageData pd) {
@@ -67,7 +80,7 @@
    @Override
    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) throws Exception {

        ResponseEntity responseEntity = null;
        ResponseEntity<String> responseEntity = null;

        SmallWeChatDto smallWeChatDto = getSmallWechat(pd, paramIn);

@@ -89,9 +102,167 @@
        }
        JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
        String orderId = orderInfo.getString("oId");
        String feeName = orderInfo.getString("feeName");
        double money = Double.parseDouble(orderInfo.getString("receivedAmount"));
        //需要判断金额是否 == 0 等于0 直接掉缴费通知接口

        //需要判断金额是否 == 0 等于0 直接调缴费通知接口
        if (money <= 0) {
            JSONObject paramOut = new JSONObject();
            paramOut.put("oId", orderId);
            String urlOut = "fee.payFeeConfirm";
            responseEntity = this.callCenterService(getHeaders("-1", pd.getAppId()), paramOut.toJSONString(), urlOut, HttpMethod.POST);
            JSONObject param = new JSONObject();
            if (responseEntity.getStatusCode() != HttpStatus.OK) {
                param.put("code", "101");
                param.put("msg", "扣费为0回调失败");
                return new ResponseEntity(JSONObject.toJSONString(param), HttpStatus.OK);
            }
            JSONObject result = JSONObject.parseObject(responseEntity.getBody());
            if (ResultVo.CODE_OK != result.getInteger("code")) {
                return responseEntity;
            }
            // 吴学文 这个代码写的有问题 已经在 payFeeConfirm 这里处理过现金了 这里还处理一遍 逻辑上有问题 ，请移植到 fee.payFeeConfirm 中处理
//            if (paramIn.containsKey("selectUserAccount") && !StringUtil.isEmpty(paramIn.getString("selectUserAccount"))) {
//                String selectUserAccount = paramIn.getString("selectUserAccount");
//                JSONArray params = JSONArray.parseArray(selectUserAccount);
//                for (int paramIndex = 0; paramIndex < params.size(); paramIndex++) {
//                    JSONObject paramObj = params.getJSONObject(paramIndex);
//                    if (!StringUtil.isEmpty(paramObj.getString("acctType")) && paramObj.getString("acctType").equals("2004")) { //积分账户
//                        //账户金额
//                        BigDecimal amount = new BigDecimal(paramObj.getString("amount"));
//                        //获取最大抵扣积分
//                        BigDecimal maximumNumber = new BigDecimal(paramObj.getString("maximumNumber"));
//                        //获取积分抵扣比例
//                        BigDecimal deductionProportion = new BigDecimal(paramObj.getString("deductionProportion"));
//                        int flag = amount.compareTo(maximumNumber);
//                        BigDecimal redepositAmount = new BigDecimal("0.00");
//                        BigDecimal integralAmount = new BigDecimal("0.00");
//                        if (flag == 1) { //账户积分大于最大使用积分，就用最大使用积分抵扣
//                            redepositAmount = maximumNumber;
//                            integralAmount = amount.subtract(maximumNumber);
//                        }
//                        if (flag > -1) { //账户积分大于等于最大使用积分，就用最大使用积分抵扣
//                            redepositAmount = maximumNumber;
//                            integralAmount = amount.subtract(maximumNumber);
//                        }
//                        if (flag == -1) { //账户积分小于最大使用积分，就用账户积分抵扣
//                            redepositAmount = amount;
//                        }
//                        if (flag < 1) { //账户积分小于等于最大使用积分，就用账户积分抵扣
//                            redepositAmount = amount;
//                        }
//                        if (flag == 0) { //账户积分等于最大使用积分
//                            redepositAmount = amount;
//                        }
//                        //更新账户信息
//                        AccountPo accountPo = new AccountPo();
//                        accountPo.setAcctId(paramObj.getString("acctId"));
//                        accountPo.setAmount(integralAmount.toString());
//                        accountInnerServiceSMOImpl.updateAccount(accountPo);
//                        //生成账户详情
//                        AccountDetailPo accountDetailPo = new AccountDetailPo();
//                        accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
//                        accountDetailPo.setAcctId(paramObj.getString("acctId"));
//                        accountDetailPo.setDetailType("2002"); //1001 转入 2002 转出
//                        accountDetailPo.setRelAcctId("-1");
//                        accountDetailPo.setAmount(redepositAmount.toString());
//                        accountDetailPo.setObjType("6006"); //6006 个人 7007 商户
//                        accountDetailPo.setObjId(paramObj.getString("objId"));
//                        accountDetailPo.setOrderId("-1");
//                        accountDetailPo.setbId("-1");
//                        accountDetailPo.setRemark("手机端积分抵扣");
//                        accountDetailPo.setCreateTime(new Date());
//                        accountDetailInnerServiceSMOImpl.saveAccountDetails(accountDetailPo);
//                        //计算积分换算的金额
//                        BigDecimal divide = redepositAmount.divide(deductionProportion);
//                        BigDecimal deductionAmount = new BigDecimal(paramIn.getString("deductionAmount"));
//                        //计算实付金额
//                        int flag2 = divide.compareTo(deductionAmount);
//                        BigDecimal subtract = new BigDecimal("0.00");
//                        //生成抵扣明细记录
//                        FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
//                        if (flag2 == -1) { //积分换算金额小于应付金额
//                            subtract = deductionAmount.subtract(divide);
//                            BigDecimal multiply = divide.multiply(deductionProportion);
//                            feeAccountDetailPo.setAmount(multiply.toString()); //积分抵扣金额
//                        } else if (flag < 1) { //积分换算金额小于等于应付金额
//                            subtract = deductionAmount.subtract(divide);
//                            BigDecimal multiply = divide.multiply(deductionProportion);
//                            feeAccountDetailPo.setAmount(multiply.toString()); //积分抵扣金额
//                        } else {
//                            BigDecimal multiply = deductionAmount.multiply(deductionProportion);
//                            feeAccountDetailPo.setAmount(multiply.toString()); //积分抵扣金额
//                        }
//                        paramIn.put("receivedMoney", subtract);
////                    payFeeDetailPo.setReceivedAmount(subtract.toString());
//                        feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
//                        feeAccountDetailPo.setDetailId(accountDetailPo.getDetailId());
//                        feeAccountDetailPo.setCommunityId(paramObj.getString("communityId"));
//                        feeAccountDetailPo.setState("1003"); //1001 无抵扣 1002 现金账户抵扣 1003 积分账户抵扣 1004 优惠券抵扣
//                        feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
//                    } else if (!StringUtil.isEmpty(paramObj.getString("acctType")) && paramObj.getString("acctType").equals("2003")) { //现金账户
//                        //账户金额
//                        BigDecimal amount = new BigDecimal(paramObj.getString("amount"));
//                        //获取应收金额
//                        BigDecimal deductionAmount = new BigDecimal("0.00");
//                        if (paramIn.containsKey("receivedMoney") && !StringUtil.isEmpty(paramIn.getString("receivedMoney"))) {
//                            deductionAmount = new BigDecimal(paramIn.getString("receivedMoney"));
//                        } else {
//                            deductionAmount = new BigDecimal(paramIn.getString("deductionAmount"));
//                        }
//                        int flag = amount.compareTo(deductionAmount);
//                        BigDecimal redepositAmount = new BigDecimal("0.00");
//                        BigDecimal integralAmount = new BigDecimal("0.00");
//                        if (flag == 1) { //现金账户大于应收金额，就用应收金额抵扣
//                            redepositAmount = deductionAmount;
//                            integralAmount = amount.subtract(deductionAmount);
//                        }
//                        if (flag > -1) { //现金账户大于等于应收金额，就用应收金额抵扣
//                            redepositAmount = deductionAmount;
//                            integralAmount = amount.subtract(deductionAmount);
//                        }
//                        if (flag == -1) { //现金账户小于实收金额，就用现金账户抵扣
//                            redepositAmount = amount;
//                        }
//                        if (flag < 1) { //现金账户小于等于应收金额，就用现金账户抵扣
//                            redepositAmount = amount;
//                        }
//                        if (flag == 0) { //现金账户等于应收金额
//                            redepositAmount = amount;
//                        }
//                        //更新账户信息
//                        AccountPo accountPo = new AccountPo();
//                        accountPo.setAcctId(paramObj.getString("acctId"));
//                        accountPo.setAmount(integralAmount.toString());
//                        accountInnerServiceSMOImpl.updateAccount(accountPo);
//                        //生成账户详情
//                        AccountDetailPo accountDetailPo = new AccountDetailPo();
//                        accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
//                        accountDetailPo.setAcctId(paramObj.getString("acctId"));
//                        accountDetailPo.setDetailType("2002"); //1001 转入 2002 转出
//                        accountDetailPo.setRelAcctId("-1");
//                        accountDetailPo.setAmount(redepositAmount.toString());
//                        accountDetailPo.setObjType("6006"); //6006 个人 7007 商户
//                        accountDetailPo.setObjId(paramObj.getString("objId"));
//                        accountDetailPo.setOrderId("-1");
//                        accountDetailPo.setbId("-1");
//                        accountDetailPo.setRemark("手机端现金账户抵扣");
//                        accountDetailPo.setCreateTime(new Date());
//                        accountDetailInnerServiceSMOImpl.saveAccountDetails(accountDetailPo);
//                        //生成抵扣明细记录
//                        FeeAccountDetailPo feeAccountDetailPo = new FeeAccountDetailPo();
//                        feeAccountDetailPo.setFadId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fadId));
//                        feeAccountDetailPo.setDetailId(accountDetailPo.getDetailId());
//                        feeAccountDetailPo.setCommunityId(paramIn.getString("communityId"));
//                        feeAccountDetailPo.setState("1002"); //1001 无抵扣 1002 现金账户抵扣 1003 积分账户抵扣 1004 优惠券抵扣
//                        feeAccountDetailPo.setAmount(redepositAmount.toString()); //积分抵扣金额
//                        feeAccountDetailServiceSMOImpl.saveFeeAccountDetail(feeAccountDetailPo);
//                    }
//                }
//            }
            param.put("code", "100");
            param.put("msg", "扣费为0回调成功");
            return new ResponseEntity(JSONObject.toJSONString(param), HttpStatus.OK);
        }
        String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
        if (AppDto.WECHAT_OWNER_APP_ID.equals(pd.getAppId())) {
            appType = OwnerAppUserDto.APP_TYPE_WECHAT;
@@ -122,12 +293,21 @@
        payAdapt = StringUtil.isEmpty(payAdapt) ? DEFAULT_PAY_ADAPT : payAdapt;
        //支付适配器
        IPayAdapt tPayAdapt = ApplicationContextFactory.getBean(payAdapt, IPayAdapt.class);
        Map result = tPayAdapt.java110Payment(outRestTemplate, paramIn.getString("feeName"), paramIn.getString("tradeType"), orderId, money, openId, smallWeChatDto);
        Map result = tPayAdapt.java110Payment(outRestTemplate, feeName, paramIn.getString("tradeType"), orderId, money, openId, smallWeChatDto);
        responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);

        return responseEntity;
    }

    private Map<String, String> getHeaders(String userId, String appId) {
        Map<String, String> headers = new HashMap<>();
        headers.put(CommonConstant.HTTP_APP_ID.toLowerCase(), appId);
        headers.put(CommonConstant.HTTP_USER_ID.toLowerCase(), userId);
        headers.put(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), UUID.randomUUID().toString());
        headers.put(CommonConstant.HTTP_REQ_TIME.toLowerCase(), DateUtil.getDefaultFormateTimeString(new Date()));
        headers.put(CommonConstant.HTTP_SIGN.toLowerCase(), "");
        return headers;
    }

    private SmallWeChatDto getSmallWechat(IPageData pd, JSONObject paramIn) {

@@ -138,7 +318,7 @@
                pd.getAppId());
        responseEntity = this.callCenterService(restTemplate, pd, "",
                "smallWeChat.listSmallWeChats?appId="
                        + paramIn.getString("appId") + "&page=1&row=1&communityId="+paramIn.getString("communityId"), HttpMethod.GET);
                        + paramIn.getString("appId") + "&page=1&row=1&communityId=" + paramIn.getString("communityId"), HttpMethod.GET);

        if (responseEntity.getStatusCode() != HttpStatus.OK) {
            return null;