Merge remote-tracking branch 'origin/master'

YYC

2025-01-07 1aac0b24b4b7f0e15bb4f7001ae8d1e313336caf

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java

@@ -9,8 +9,11 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35InoutCustomer;
import com.fzzy.async.fzzy35.entity.Fz35MContract;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1201Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1212Rep;
import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +39,9 @@
    private Api1102Rep api1102Rep;
    @Autowired
    private ApiLogRep apiLogRep;

    @Autowired
    private Fzzy35Sync1212Rep fzzySync1212Rep;


    /**
@@ -70,6 +76,7 @@

            Api1201 apiData;
            List<Api1201> api1201List;
            List<Fz35InoutCustomer> listCustomer;
            for (Fz35MContract sysData : list) {

                apiData = new Api1201();
@@ -79,23 +86,30 @@
                apiData.setDwdm(api1201.getDwdm());

                //业务类型
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
                apiData.setYwlx(mappingCode);
                apiData.setYwlx(sysData.getType());
                //客户类型
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_KHLX, sysData.getCustomerType());
                apiData.setKhlx(mappingCode);

                apiData.setKhtyshxydm(StringUtils.isEmpty(sysData.getCustomerId()) ? "100000000000000000" :sysData.getCustomerId());
                apiData.setKhlx(sysData.getCustomerType());
                //企业客户，需要设置信用码
                if ("1".equals(sysData.getCustomerType())) {
                    listCustomer = fzzySync1212Rep.getDataById(sysData.getCustomerId());
                    if (null == listCustomer || listCustomer.isEmpty()) {
                        continue;
                    }
                    apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
                }

                apiData.setKhmc(sysData.getCustomerName());
                apiData.setFddbr(sysData.getCustomerSignUser());
                apiData.setFddbr(StringUtils.isEmpty(sysData.getCustomerSignUser()) ? null : sysData.getCustomerSignUser());

                apiData.setQdrq(sysData.getSigningTime());

                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(sysData.getFoodVariety())){
                    continue;
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
                apiData.setLspzdm(mappingCode);

                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodVariety());
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setLsxzdm(mappingCode);

                //单价：元/吨
@@ -107,9 +121,10 @@
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_JSYHTYZX, "");
                apiData.setJsyhtyzx(mappingCode);

                apiData.setJsyhtyzx("1");

                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getCustomerBank());
                apiData.setKhfkhh(mappingCode);

                apiData.setKhfzh(sysData.getCustomerBankAccount());

                apiData.setKhqyr(sysData.getCustomerSignUser());
@@ -117,7 +132,7 @@
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
                apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);

                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "1000000000000000000" : sysData.getBankAccount());
                apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());

                apiData.setWcrq(sysData.getEndTime());

@@ -125,9 +140,7 @@

                apiData.setSyncTime(new Date());
                apiData.setBizId(sysData.getId());

                apiLog.setDataId(apiData.getBizId());
                apiLog.setKqdm(kqdm);
                apiData.setKqdm(kqdm);

                api1201List = api1201Rep.getDataById(apiData.getHth());
                if(null == api1201List || api1201List.isEmpty()){