diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java index 725a69c8..b823a723 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java @@ -139,4 +139,5 @@ public class BuyerEntity implements Serializable { private String syncOrder; private String entId; + private String deptId; } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index 7472b836..c6c04134 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -140,6 +140,7 @@ public class BuyerServiceImpl implements BuyerService { /** * 导入数据不校验必填 */ + buyerEntity.setSyncOrder("0"); if (StringUtils.isBlank(buyerEntity.getBuyerCode())) { buyerEntity.setBuyerCode(baseService.getGenerateShotKey()); } @@ -349,23 +350,19 @@ public class BuyerServiceImpl implements BuyerService { /** * 根据入参进行判断是新增还是修改 */ + Boolean isAdd = false; + if(StringUtils.isBlank(buyerEntity.getId())){ + isAdd = true; + } + if(buyerEntity.getSynchronizeOrders()){ + buyerEntity.setSyncOrder("1"); + }else{ + buyerEntity.setSyncOrder("0"); + } List shList = new ArrayList<>(); shList.add(buyerEntity.getXhfNsrsbh()); R r = new R(); - BuyerEntity queryBuyerEntity = new BuyerEntity(); - queryBuyerEntity.setBuyerCode(buyerEntity.getId()); - BuyerEntity entity = buyerMapper.selectBuyerByCodeOrNameAndNsrsbh("", buyerEntity.getBuyerCode(), null); - if(entity != null){ - if (StringUtils.isNotBlank(buyerEntity.getId())) { - if(!buyerEntity.getId().equals(entity.getId())){ - return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); - } - }else { - return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); - } - } - // if (ConfigureConstant.STRING_1.equals(buyerEntity.getIsEdit()) && StringUtils.isBlank(buyerEntity.getId())) { BuyerEntity existBuyer = isExistBuyer(buyerEntity); if (ObjectUtil.isNotNull(existBuyer)) { @@ -396,6 +393,9 @@ public class BuyerServiceImpl implements BuyerService { buyerMapper.deleteBuyerDetail(buyerEntity.getId()); buyerMapper.batchInsertBuyerDetail(buyerEntity.getBuyerEntityDetail()); } + if(isAdd && existBuyer != null){ + return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999); + } if (existBuyer != null) {//StringUtils.isNotBlank(buyerEntity.getId()) buyerEntity.setModifyTime(new Date()); @@ -419,10 +419,6 @@ public class BuyerServiceImpl implements BuyerService { } } - if("0".equals(buyerEntity.getSynchronizeOrders())){ - //更新订单 - } - return R.ok().put(OrderManagementConstant.MESSAGE, "保存成功!"); } diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index 932859d2..34aa68fb 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -26,6 +26,7 @@ + @@ -68,6 +69,7 @@ bmi.create_time, bmi.status, bmi.sync_order, + bmi.ent_id, bmid.consumer_id, bmid.buyer_manage_id, bmid.bank_name, @@ -152,7 +154,8 @@ buyer_code, rownum as rowno, status, - sync_order + sync_order, + ent_id FROM buyer_manage_info @@ -280,6 +283,9 @@ sync_order = #{buyer.syncOrder,jdbcType=VARCHAR}, + + ent_id = #{buyer.deptId,jdbcType=VARCHAR}, + id = #{buyer.id,jdbcType=VARCHAR} @@ -371,6 +377,9 @@ sync_order = #{buyer.syncOrder,jdbcType=VARCHAR}, + + ent_id = #{buyer.deptId,jdbcType=VARCHAR}, + id in @@ -497,6 +506,9 @@ sync_order, + + ent_id, + @@ -573,6 +585,9 @@ #{syncOrder,jdbcType=VARCHAR}, + + #{deptId,jdbcType=VARCHAR}, + @@ -792,7 +807,8 @@ invoice_taxno, mdm_multicode_json, status, - sync_order + sync_order, + ent_id ) values @@ -890,8 +907,10 @@ modify_user_id, ghf_qylx, + buyer_code, status, - sync_order + sync_order, + ent_id FROM buyer_manage_info diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java index 8ce6bdcb..7df13a5d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java @@ -7,6 +7,7 @@ import com.dxhy.order.baseservice.annotation.SysLog; import com.dxhy.order.baseservice.config.BaseServiceConfig; import com.dxhy.order.baseservice.module.base.service.ExcelReadService; import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; +import com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail; import com.dxhy.order.baseservice.module.buyer.model.BuyerImportExcel; import com.dxhy.order.baseservice.module.buyer.model.BuyerImportExcelEnum; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; @@ -34,6 +35,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*; +import java.util.stream.Stream; /** * 购方信息控制层 @@ -146,9 +148,34 @@ public class BuyerController { @ApiOperation(value = "购方信息批量保存", notes = "购方信息管理-购方信息批量保存") @PostMapping("/saveBuyerInfoList") public R saveBuyerInfoList(@RequestBody List buyerList) { - //todo 更新订单购方信息 - OrderInfo orderInfo = new OrderInfo(); - //orderInfoService.updateOrderInfoByOrderId(); + + if(buyerList != null && buyerList.size()==1){ + BuyerEntity buyerEntity = buyerList.get(0); + if(StringUtils.isBlank(buyerEntity.getDeptId())){ + return R.error("请求参数有误"); + } + + if(buyerEntity.getSynchronizeOrders()){ + + OrderInfo orderInfo = new OrderInfo(); + orderInfo.setGhfMc(StringUtils.isBlank(buyerEntity.getTaxpayerCode())?null:buyerEntity.getTaxpayerCode()); + orderInfo.setGhfNsrsbh(StringUtils.isBlank(buyerEntity.getPurchaseName())?null:buyerEntity.getPurchaseName()); + if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){ + buyerEntity.getBuyerEntityDetail().forEach(t->{ + if("0".equals(t.getDefaultMark())){ + orderInfo.setGhfDz(StringUtils.isBlank(buyerEntity.getAddress())?null:buyerEntity.getAddress()); + orderInfo.setGhfDh(StringUtils.isBlank(buyerEntity.getPhone())?null:buyerEntity.getPhone()); + orderInfo.setGhfYh(StringUtils.isBlank(buyerEntity.getBankOfDeposit())?null:buyerEntity.getBankOfDeposit()); + orderInfo.setGhfZh(StringUtils.isBlank(buyerEntity.getBankNumber())?null:buyerEntity.getBankNumber()); + } + }); + } + orderInfo.setEntId(buyerEntity.getDeptId()); + orderInfo.setGhfSj(StringUtils.isBlank(buyerEntity.getSjh())?null:buyerEntity.getSjh()); + orderInfo.setGhfEmail(StringUtils.isBlank(buyerEntity.getEmail())?null:buyerEntity.getEmail()); + orderInfoService.updateOrderBuyerInfo(orderInfo,null); + } + } // 业务逻辑放到provider return buyerService.saveBuyerInfoList(buyerList, userInfoService.getUser().getUserId() == null ? "" : String.valueOf(userInfoService.getUser().getUserId())); @@ -186,7 +213,8 @@ public class BuyerController { @ApiParam(name = "xhfDh", value = "销货方电话", required = true) @RequestParam(value = "xhfDh") String xhfDh, @ApiParam(name = "xhfZh", value = "销货方账号", required = true) @RequestParam(value = "xhfZh") String xhfZh, @ApiParam(name = "xhfNsrsbh", value = "销货方纳税人识别号", required = true) @RequestParam(value = "xhfNsrsbh") String xhfNsrsbh, - @ApiParam(name = "xhfMc", value = "销货方纳税人名称", required = true) @RequestParam(value = "xhfMc") String xhfMc) { + @ApiParam(name = "xhfMc", value = "销货方纳税人名称", required = true) @RequestParam(value = "xhfMc") String xhfMc, + @ApiParam(name = "entId", value = "销货deptid", required = true) @RequestParam(value = "entId") String entId) { R r = new R(); try { @@ -243,6 +271,7 @@ public class BuyerController { //购方名称 带中文括号的转换成英文括号 // 购方名称 带中文括号的转换成英文括号 buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true)); + buyerEntity.setEntId(entId); buyerEntityList.add(buyerEntity); } r = buyerService.importBuyerByExcel(buyerEntityList); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java index e4db46e1..06b0b7ba 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java @@ -146,7 +146,7 @@ public interface OrderInfoService { * @param shList * @return */ - //int updateOrderBuyerInfo(OrderInfo orderInfo, List shList); + int updateOrderBuyerInfo(OrderInfo orderInfo, List shList); /** * 根据原发票代码号码 查询原蓝票订单信息 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index da1eb457..7eff9748 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1176,6 +1176,11 @@ public class OrderInfoServiceImpl implements OrderInfoService { return orderMapper.updateOrderInfoByOrderId(orderInfo, shList); } + @Override + public int updateOrderBuyerInfo(OrderInfo orderInfo, List shList){ + return orderMapper.updateOrderBuyerInfo(orderInfo,shList); + } + @Override public OrderInfo selectOrderInfoByOrderId(String id, List shList) { return orderMapper.selectOrderInfoByOrderId(id, shList); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java index e8fa3c21..db915d81 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java @@ -46,8 +46,15 @@ public interface OrderInfoMapper { * @param shList * @return */ - int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("shList") List shList); + int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("ent") List shList); + /** + * 根据销方税号 + * @param orderInfo + * @param shList + * @return + */ + int updateOrderBuyerInfo(@Param("orderInfo") OrderInfo orderInfo, @Param("shList")List shList); /** * 通过发票代码号码查询所有order信息 * diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml index 201e051e..486355b4 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml @@ -1,551 +1,600 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - id, process_id, fpqqlsh, ddh, thdh, ddlx, dsptbm, nsrsbh, nsrmc, - nsrdzdah, swjg_dm, - dkbz, pydm, kpxm, bbm_bbh, xhf_mc, xhf_nsrsbh, xhf_dz, - xhf_dh, - xhf_yh, xhf_zh, - ghf_qylx, ghf_sf, ghf_id, ghf_mc, ghf_nsrsbh, ghf_dz, ghf_dh, ghf_yh, ghf_zh, - ghf_sj, - ghf_email, - hy_dm, hy_mc, kpr, kprzjhm, kprzjlx, skr, fhr, ddrq, kplx,qylx, fpzl_dm, yfp_dm, yfp_hm, - yfp_fpzl, yfp_kprq, chyy, tschbz, czdm, - qd_bz, qd_xmmc, kphjje, hjbhsje, hjse, mdh, ywlx, tqm,bz, kpjh, sld,hzxxbbh,ent_id,sksbdm, - slkjly,byzd1, byzd2, byzd3, byzd4, byzd5, create_time, - update_time - - - - insert into order_info (id, - process_id, - fpqqlsh, - ddh, - thdh, - ddlx, - dsptbm, - nsrsbh, - nsrmc, - nsrdzdah, - swjg_dm, - dkbz, - pydm, - kpxm, - bbm_bbh, - xhf_mc, - xhf_nsrsbh, - xhf_dz, - xhf_dh, - xhf_yh, - xhf_zh, - ghf_qylx, - ghf_sf, - ghf_id, - ghf_mc, - ghf_nsrsbh, - ghf_dz, - ghf_dh, - ghf_yh, - ghf_zh, - ghf_sj, - ghf_email, - hy_dm, - hy_mc, - kpr, - kprzjhm, - kprzjlx, - skr, - fhr, - ddrq, - kplx, - qylx, - fpzl_dm, - yfp_dm, - yfp_hm, - yfp_fpzl, - yfp_kprq, - chyy, - tschbz, - czdm, - qd_bz, - qd_xmmc, - kphjje, - hjbhsje, - hjse, - mdh, - ywlx, - tqm, - bz, - kpjh, - sld, - hzxxbbh, - ent_id, - sksbdm, - slkjly, - byzd1, - byzd2, - byzd3, - byzd4, - byzd5, - create_time, - update_time) - values (#{id,jdbcType=VARCHAR}, - #{processId,jdbcType=VARCHAR}, - #{fpqqlsh,jdbcType=VARCHAR}, - #{ddh,jdbcType=VARCHAR}, - #{thdh,jdbcType=VARCHAR}, - #{ddlx,jdbcType=VARCHAR}, - #{dsptbm,jdbcType=VARCHAR}, - #{nsrsbh,jdbcType=VARCHAR}, - #{nsrmc,jdbcType=VARCHAR}, - #{nsrdzdah,jdbcType=VARCHAR}, - #{swjgDm,jdbcType=VARCHAR}, - #{dkbz,jdbcType=VARCHAR}, - #{pydm,jdbcType=VARCHAR}, - #{kpxm,jdbcType=VARCHAR}, - #{bbmBbh,jdbcType=VARCHAR}, - #{xhfMc,jdbcType=VARCHAR}, - #{xhfNsrsbh,jdbcType=VARCHAR}, - #{xhfDz,jdbcType=VARCHAR}, - #{xhfDh,jdbcType=VARCHAR}, - #{xhfYh,jdbcType=VARCHAR}, - #{xhfZh,jdbcType=VARCHAR}, - #{ghfQylx,jdbcType=VARCHAR}, - #{ghfSf,jdbcType=VARCHAR}, - #{ghfId,jdbcType=VARCHAR}, - #{ghfMc,jdbcType=VARCHAR}, - #{ghfNsrsbh,jdbcType=VARCHAR}, - #{ghfDz,jdbcType=VARCHAR}, - #{ghfDh,jdbcType=VARCHAR}, - #{ghfYh,jdbcType=VARCHAR}, - #{ghfZh,jdbcType=VARCHAR}, - #{ghfSj,jdbcType=VARCHAR}, - #{ghfEmail,jdbcType=VARCHAR}, - #{hyDm,jdbcType=VARCHAR}, - #{hyMc,jdbcType=VARCHAR}, - #{kpr,jdbcType=VARCHAR}, - #{kprzjhm,jdbcType=VARCHAR}, - #{kprzjlx,jdbcType=VARCHAR}, - #{skr,jdbcType=VARCHAR}, - #{fhr,jdbcType=VARCHAR}, - #{ddrq,jdbcType=TIMESTAMP}, - #{kplx,jdbcType=VARCHAR}, - #{qylx,jdbcType=VARCHAR}, - #{fpzlDm,jdbcType=VARCHAR}, - #{yfpDm,jdbcType=VARCHAR}, - #{yfpHm,jdbcType=VARCHAR}, - #{yfpFpzl,jdbcType=VARCHAR}, - #{yfpKprq,jdbcType=TIMESTAMP}, - #{chyy,jdbcType=VARCHAR}, - #{tschbz,jdbcType=VARCHAR}, - #{czdm,jdbcType=VARCHAR}, - #{qdBz,jdbcType=VARCHAR}, - #{qdXmmc,jdbcType=VARCHAR}, - #{kphjje,jdbcType=VARCHAR}, - #{hjbhsje,jdbcType=VARCHAR}, - #{hjse,jdbcType=VARCHAR}, - #{mdh,jdbcType=VARCHAR}, - #{ywlx,jdbcType=VARCHAR}, - #{tqm,jdbcType=VARCHAR}, - #{bz,jdbcType=VARCHAR}, - #{kpjh,jdbcType=VARCHAR}, - #{sld,jdbcType=VARCHAR}, - #{hzxxbbh,jdbcType=VARCHAR}, - #{entId,jdbcType=VARCHAR}, - #{sksbCode,jdbcType=VARCHAR}, - #{slkjly,jdbcType=VARCHAR}, - #{byzd1,jdbcType=VARCHAR}, - #{byzd2,jdbcType=VARCHAR}, - #{byzd3,jdbcType=VARCHAR}, - #{byzd4,jdbcType=VARCHAR}, - #{byzd5,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - + + id, process_id, fpqqlsh, ddh, thdh, ddlx, dsptbm, nsrsbh, nsrmc, + nsrdzdah, swjg_dm, + dkbz, pydm, kpxm, bbm_bbh, xhf_mc, xhf_nsrsbh, xhf_dz, + xhf_dh, + xhf_yh, xhf_zh, + ghf_qylx, ghf_sf, ghf_id, ghf_mc, ghf_nsrsbh, ghf_dz, ghf_dh, ghf_yh, ghf_zh, + ghf_sj, + ghf_email, + hy_dm, hy_mc, kpr, kprzjhm, kprzjlx, skr, fhr, ddrq, kplx,qylx, fpzl_dm, yfp_dm, yfp_hm, + yfp_fpzl, yfp_kprq, chyy, tschbz, czdm, + qd_bz, qd_xmmc, kphjje, hjbhsje, hjse, mdh, ywlx, tqm,bz, kpjh, sld,hzxxbbh,ent_id,sksbdm, + slkjly,byzd1, byzd2, byzd3, byzd4, byzd5, create_time, + update_time + + + + insert into order_info (id, + process_id, + fpqqlsh, + ddh, + thdh, + ddlx, + dsptbm, + nsrsbh, + nsrmc, + nsrdzdah, + swjg_dm, + dkbz, + pydm, + kpxm, + bbm_bbh, + xhf_mc, + xhf_nsrsbh, + xhf_dz, + xhf_dh, + xhf_yh, + xhf_zh, + ghf_qylx, + ghf_sf, + ghf_id, + ghf_mc, + ghf_nsrsbh, + ghf_dz, + ghf_dh, + ghf_yh, + ghf_zh, + ghf_sj, + ghf_email, + hy_dm, + hy_mc, + kpr, + kprzjhm, + kprzjlx, + skr, + fhr, + ddrq, + kplx, + qylx, + fpzl_dm, + yfp_dm, + yfp_hm, + yfp_fpzl, + yfp_kprq, + chyy, + tschbz, + czdm, + qd_bz, + qd_xmmc, + kphjje, + hjbhsje, + hjse, + mdh, + ywlx, + tqm, + bz, + kpjh, + sld, + hzxxbbh, + ent_id, + sksbdm, + slkjly, + byzd1, + byzd2, + byzd3, + byzd4, + byzd5, + create_time, + update_time) + values (#{id,jdbcType=VARCHAR}, + #{processId,jdbcType=VARCHAR}, + #{fpqqlsh,jdbcType=VARCHAR}, + #{ddh,jdbcType=VARCHAR}, + #{thdh,jdbcType=VARCHAR}, + #{ddlx,jdbcType=VARCHAR}, + #{dsptbm,jdbcType=VARCHAR}, + #{nsrsbh,jdbcType=VARCHAR}, + #{nsrmc,jdbcType=VARCHAR}, + #{nsrdzdah,jdbcType=VARCHAR}, + #{swjgDm,jdbcType=VARCHAR}, + #{dkbz,jdbcType=VARCHAR}, + #{pydm,jdbcType=VARCHAR}, + #{kpxm,jdbcType=VARCHAR}, + #{bbmBbh,jdbcType=VARCHAR}, + #{xhfMc,jdbcType=VARCHAR}, + #{xhfNsrsbh,jdbcType=VARCHAR}, + #{xhfDz,jdbcType=VARCHAR}, + #{xhfDh,jdbcType=VARCHAR}, + #{xhfYh,jdbcType=VARCHAR}, + #{xhfZh,jdbcType=VARCHAR}, + #{ghfQylx,jdbcType=VARCHAR}, + #{ghfSf,jdbcType=VARCHAR}, + #{ghfId,jdbcType=VARCHAR}, + #{ghfMc,jdbcType=VARCHAR}, + #{ghfNsrsbh,jdbcType=VARCHAR}, + #{ghfDz,jdbcType=VARCHAR}, + #{ghfDh,jdbcType=VARCHAR}, + #{ghfYh,jdbcType=VARCHAR}, + #{ghfZh,jdbcType=VARCHAR}, + #{ghfSj,jdbcType=VARCHAR}, + #{ghfEmail,jdbcType=VARCHAR}, + #{hyDm,jdbcType=VARCHAR}, + #{hyMc,jdbcType=VARCHAR}, + #{kpr,jdbcType=VARCHAR}, + #{kprzjhm,jdbcType=VARCHAR}, + #{kprzjlx,jdbcType=VARCHAR}, + #{skr,jdbcType=VARCHAR}, + #{fhr,jdbcType=VARCHAR}, + #{ddrq,jdbcType=TIMESTAMP}, + #{kplx,jdbcType=VARCHAR}, + #{qylx,jdbcType=VARCHAR}, + #{fpzlDm,jdbcType=VARCHAR}, + #{yfpDm,jdbcType=VARCHAR}, + #{yfpHm,jdbcType=VARCHAR}, + #{yfpFpzl,jdbcType=VARCHAR}, + #{yfpKprq,jdbcType=TIMESTAMP}, + #{chyy,jdbcType=VARCHAR}, + #{tschbz,jdbcType=VARCHAR}, + #{czdm,jdbcType=VARCHAR}, + #{qdBz,jdbcType=VARCHAR}, + #{qdXmmc,jdbcType=VARCHAR}, + #{kphjje,jdbcType=VARCHAR}, + #{hjbhsje,jdbcType=VARCHAR}, + #{hjse,jdbcType=VARCHAR}, + #{mdh,jdbcType=VARCHAR}, + #{ywlx,jdbcType=VARCHAR}, + #{tqm,jdbcType=VARCHAR}, + #{bz,jdbcType=VARCHAR}, + #{kpjh,jdbcType=VARCHAR}, + #{sld,jdbcType=VARCHAR}, + #{hzxxbbh,jdbcType=VARCHAR}, + #{entId,jdbcType=VARCHAR}, + #{sksbCode,jdbcType=VARCHAR}, + #{slkjly,jdbcType=VARCHAR}, + #{byzd1,jdbcType=VARCHAR}, + #{byzd2,jdbcType=VARCHAR}, + #{byzd3,jdbcType=VARCHAR}, + #{byzd4,jdbcType=VARCHAR}, + #{byzd5,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}) + - - update order_info - - - process_id = #{orderInfo.processId,jdbcType=VARCHAR}, - - - fpqqlsh = #{orderInfo.fpqqlsh,jdbcType=VARCHAR}, - - - ddh = #{orderInfo.ddh,jdbcType=VARCHAR}, - - - thdh = #{orderInfo.thdh,jdbcType=VARCHAR}, - - - ddlx = #{orderInfo.ddlx,jdbcType=VARCHAR}, - - - dsptbm = #{orderInfo.dsptbm,jdbcType=VARCHAR}, - - - nsrsbh = #{orderInfo.nsrsbh,jdbcType=VARCHAR}, - - - nsrmc = #{orderInfo.nsrmc,jdbcType=VARCHAR}, - - - nsrdzdah = #{orderInfo.nsrdzdah,jdbcType=VARCHAR}, - - - swjg_dm = #{orderInfo.swjgDm,jdbcType=VARCHAR}, - - - dkbz = #{orderInfo.dkbz,jdbcType=VARCHAR}, - - - pydm = #{orderInfo.pydm,jdbcType=VARCHAR}, - - - kpxm = #{orderInfo.kpxm,jdbcType=VARCHAR}, - - - bbm_bbh = #{orderInfo.bbmBbh,jdbcType=VARCHAR}, - - - xhf_mc = #{orderInfo.xhfMc,jdbcType=VARCHAR}, - - - xhf_nsrsbh = #{orderInfo.xhfNsrsbh,jdbcType=VARCHAR}, - - - xhf_dz = #{orderInfo.xhfDz,jdbcType=VARCHAR}, - - - xhf_dh = #{orderInfo.xhfDh,jdbcType=VARCHAR}, - - - xhf_yh = #{orderInfo.xhfYh,jdbcType=VARCHAR}, - - - xhf_zh = #{orderInfo.xhfZh,jdbcType=VARCHAR}, - - - ghf_qylx = #{orderInfo.ghfQylx,jdbcType=VARCHAR}, - - - ghf_sf = #{orderInfo.ghfSf,jdbcType=VARCHAR}, - - - ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR}, - - - ghf_id = #{orderInfo.ghfId,jdbcType=VARCHAR}, - - - ghf_nsrsbh = #{orderInfo.ghfNsrsbh,jdbcType=VARCHAR}, - - - ghf_dz = #{orderInfo.ghfDz,jdbcType=VARCHAR}, - - - ghf_dh = #{orderInfo.ghfDh,jdbcType=VARCHAR}, - - - ghf_yh = #{orderInfo.ghfYh,jdbcType=VARCHAR}, - - - ghf_zh = #{orderInfo.ghfZh,jdbcType=VARCHAR}, - - - ghf_sj = #{orderInfo.ghfSj,jdbcType=VARCHAR}, - - - ghf_email = #{orderInfo.ghfEmail,jdbcType=VARCHAR}, - - - hy_dm = #{orderInfo.hyDm,jdbcType=VARCHAR}, - - - hy_mc = #{orderInfo.hyMc,jdbcType=VARCHAR}, - - - kpr = #{orderInfo.kpr,jdbcType=VARCHAR}, - - - kprzjhm = #{orderInfo.kprzjhm,jdbcType=VARCHAR}, - - - kprzjlx = #{orderInfo.kprzjlx,jdbcType=VARCHAR}, - - - skr = #{orderInfo.skr,jdbcType=VARCHAR}, - - - fhr = #{orderInfo.fhr,jdbcType=VARCHAR}, - - - ddrq = #{orderInfo.ddrq,jdbcType=TIMESTAMP}, - - - kplx = #{orderInfo.kplx,jdbcType=VARCHAR}, - - - qylx = #{orderInfo.qylx,jdbcType=VARCHAR}, - - - fpzl_dm = #{orderInfo.fpzlDm,jdbcType=VARCHAR}, - - - yfp_dm = #{orderInfo.yfpDm,jdbcType=VARCHAR}, - - - yfp_hm = #{orderInfo.yfpHm,jdbcType=VARCHAR}, - - - chyy = #{orderInfo.chyy,jdbcType=VARCHAR}, - - - yfp_fpzl = #{orderInfo.yfpFpzl,jdbcType=VARCHAR}, - - - yfp_kprq = #{orderInfo.yfpKprq,jdbcType=TIMESTAMP}, - - - tschbz = #{orderInfo.tschbz,jdbcType=VARCHAR}, - - - czdm = #{orderInfo.czdm,jdbcType=VARCHAR}, - - - qd_bz = #{orderInfo.qdBz,jdbcType=VARCHAR}, - - - qd_xmmc = #{orderInfo.qdXmmc,jdbcType=VARCHAR}, - - - kphjje = #{orderInfo.kphjje,jdbcType=VARCHAR}, - - - hjbhsje = #{orderInfo.hjbhsje,jdbcType=VARCHAR}, - - - hjse = #{orderInfo.hjse,jdbcType=VARCHAR}, - - - mdh = #{orderInfo.mdh,jdbcType=VARCHAR}, - - - ywlx = #{orderInfo.ywlx,jdbcType=VARCHAR}, - - - tqm = #{orderInfo.tqm,jdbcType=VARCHAR}, - - - bz = #{orderInfo.bz,jdbcType=VARCHAR}, - - - kpjh = #{orderInfo.kpjh,jdbcType=VARCHAR}, - - - sld = #{orderInfo.sld,jdbcType=VARCHAR}, - - - hzxxbbh = #{orderInfo.hzxxbbh,jdbcType=VARCHAR}, - - - ent_id = #{orderInfo.entId,jdbcType=VARCHAR}, - - - sksbdm = #{orderInfo.sksbCode,jdbcType=VARCHAR}, - - - slkjly = #{orderInfo.slkjly,jdbcType=VARCHAR}, - - - byzd1 = #{orderInfo.byzd1,jdbcType=VARCHAR}, - - - byzd2 = #{orderInfo.byzd2,jdbcType=VARCHAR}, - - - byzd3 = #{orderInfo.byzd3,jdbcType=VARCHAR}, - - - byzd4 = #{orderInfo.byzd4,jdbcType=VARCHAR}, - - - byzd5 = #{orderInfo.byzd5,jdbcType=VARCHAR}, - - - create_time = #{orderInfo.createTime,jdbcType=TIMESTAMP}, - - - update_time = #{orderInfo.updateTime,jdbcType=TIMESTAMP}, - - - where id = #{orderInfo.id,jdbcType=VARCHAR} - - and xhf_nsrsbh = '' - - - and xhf_nsrsbh = - - #{item} - - - - and xhf_nsrsbh in - - #{item} - - - + + update order_info + + + process_id = #{orderInfo.processId,jdbcType=VARCHAR}, + + + fpqqlsh = #{orderInfo.fpqqlsh,jdbcType=VARCHAR}, + + + ddh = #{orderInfo.ddh,jdbcType=VARCHAR}, + + + thdh = #{orderInfo.thdh,jdbcType=VARCHAR}, + + + ddlx = #{orderInfo.ddlx,jdbcType=VARCHAR}, + + + dsptbm = #{orderInfo.dsptbm,jdbcType=VARCHAR}, + + + nsrsbh = #{orderInfo.nsrsbh,jdbcType=VARCHAR}, + + + nsrmc = #{orderInfo.nsrmc,jdbcType=VARCHAR}, + + + nsrdzdah = #{orderInfo.nsrdzdah,jdbcType=VARCHAR}, + + + swjg_dm = #{orderInfo.swjgDm,jdbcType=VARCHAR}, + + + dkbz = #{orderInfo.dkbz,jdbcType=VARCHAR}, + + + pydm = #{orderInfo.pydm,jdbcType=VARCHAR}, + + + kpxm = #{orderInfo.kpxm,jdbcType=VARCHAR}, + + + bbm_bbh = #{orderInfo.bbmBbh,jdbcType=VARCHAR}, + + + xhf_mc = #{orderInfo.xhfMc,jdbcType=VARCHAR}, + + + xhf_nsrsbh = #{orderInfo.xhfNsrsbh,jdbcType=VARCHAR}, + + + xhf_dz = #{orderInfo.xhfDz,jdbcType=VARCHAR}, + + + xhf_dh = #{orderInfo.xhfDh,jdbcType=VARCHAR}, + + + xhf_yh = #{orderInfo.xhfYh,jdbcType=VARCHAR}, + + + xhf_zh = #{orderInfo.xhfZh,jdbcType=VARCHAR}, + + + ghf_qylx = #{orderInfo.ghfQylx,jdbcType=VARCHAR}, + + + ghf_sf = #{orderInfo.ghfSf,jdbcType=VARCHAR}, + + + ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR}, + + + ghf_id = #{orderInfo.ghfId,jdbcType=VARCHAR}, + + + ghf_nsrsbh = #{orderInfo.ghfNsrsbh,jdbcType=VARCHAR}, + + + ghf_dz = #{orderInfo.ghfDz,jdbcType=VARCHAR}, + + + ghf_dh = #{orderInfo.ghfDh,jdbcType=VARCHAR}, + + + ghf_yh = #{orderInfo.ghfYh,jdbcType=VARCHAR}, + + + ghf_zh = #{orderInfo.ghfZh,jdbcType=VARCHAR}, + + + ghf_sj = #{orderInfo.ghfSj,jdbcType=VARCHAR}, + + + ghf_email = #{orderInfo.ghfEmail,jdbcType=VARCHAR}, + + + hy_dm = #{orderInfo.hyDm,jdbcType=VARCHAR}, + + + hy_mc = #{orderInfo.hyMc,jdbcType=VARCHAR}, + + + kpr = #{orderInfo.kpr,jdbcType=VARCHAR}, + + + kprzjhm = #{orderInfo.kprzjhm,jdbcType=VARCHAR}, + + + kprzjlx = #{orderInfo.kprzjlx,jdbcType=VARCHAR}, + + + skr = #{orderInfo.skr,jdbcType=VARCHAR}, + + + fhr = #{orderInfo.fhr,jdbcType=VARCHAR}, + + + ddrq = #{orderInfo.ddrq,jdbcType=TIMESTAMP}, + + + kplx = #{orderInfo.kplx,jdbcType=VARCHAR}, + + + qylx = #{orderInfo.qylx,jdbcType=VARCHAR}, + + + fpzl_dm = #{orderInfo.fpzlDm,jdbcType=VARCHAR}, + + + yfp_dm = #{orderInfo.yfpDm,jdbcType=VARCHAR}, + + + yfp_hm = #{orderInfo.yfpHm,jdbcType=VARCHAR}, + + + chyy = #{orderInfo.chyy,jdbcType=VARCHAR}, + + + yfp_fpzl = #{orderInfo.yfpFpzl,jdbcType=VARCHAR}, + + + yfp_kprq = #{orderInfo.yfpKprq,jdbcType=TIMESTAMP}, + + + tschbz = #{orderInfo.tschbz,jdbcType=VARCHAR}, + + + czdm = #{orderInfo.czdm,jdbcType=VARCHAR}, + + + qd_bz = #{orderInfo.qdBz,jdbcType=VARCHAR}, + + + qd_xmmc = #{orderInfo.qdXmmc,jdbcType=VARCHAR}, + + + kphjje = #{orderInfo.kphjje,jdbcType=VARCHAR}, + + + hjbhsje = #{orderInfo.hjbhsje,jdbcType=VARCHAR}, + + + hjse = #{orderInfo.hjse,jdbcType=VARCHAR}, + + + mdh = #{orderInfo.mdh,jdbcType=VARCHAR}, + + + ywlx = #{orderInfo.ywlx,jdbcType=VARCHAR}, + + + tqm = #{orderInfo.tqm,jdbcType=VARCHAR}, + + + bz = #{orderInfo.bz,jdbcType=VARCHAR}, + + + kpjh = #{orderInfo.kpjh,jdbcType=VARCHAR}, + + + sld = #{orderInfo.sld,jdbcType=VARCHAR}, + + + hzxxbbh = #{orderInfo.hzxxbbh,jdbcType=VARCHAR}, + + + ent_id = #{orderInfo.entId,jdbcType=VARCHAR}, + + + sksbdm = #{orderInfo.sksbCode,jdbcType=VARCHAR}, + + + slkjly = #{orderInfo.slkjly,jdbcType=VARCHAR}, + + + byzd1 = #{orderInfo.byzd1,jdbcType=VARCHAR}, + + + byzd2 = #{orderInfo.byzd2,jdbcType=VARCHAR}, + + + byzd3 = #{orderInfo.byzd3,jdbcType=VARCHAR}, + + + byzd4 = #{orderInfo.byzd4,jdbcType=VARCHAR}, + + + byzd5 = #{orderInfo.byzd5,jdbcType=VARCHAR}, + + + create_time = #{orderInfo.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{orderInfo.updateTime,jdbcType=TIMESTAMP}, + + + where id = #{orderInfo.id,jdbcType=VARCHAR} + + and xhf_nsrsbh = '' + + + and xhf_nsrsbh = + + #{item} + + + + and xhf_nsrsbh in + + #{item} + + + + + update order_info oi + LEFT JOIN order_process_info op on oi.id = op.order_info_id + left join order_invoice_info oii on oii.order_info_id = oi.id + + + oi.ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR}, + + + oi.ghf_nsrsbh = #{orderInfo.ghfNsrsbh,jdbcType=VARCHAR}, + + + oi.ghf_dz = #{orderInfo.ghfDz,jdbcType=VARCHAR}, + + + oi.ghf_dh = #{orderInfo.ghfDh,jdbcType=VARCHAR}, + + + oi.ghf_yh = #{orderInfo.ghfYh,jdbcType=VARCHAR}, + + + oi.ghf_zh = #{orderInfo.ghfZh,jdbcType=VARCHAR}, + + + + oi.ghf_sj = #{orderInfo.ghfSj,jdbcType=VARCHAR}, + + + oi.ghf_email = #{orderInfo.ghfEmail,jdbcType=VARCHAR}, + + + + op.ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR}, + + + op.ghf_nsrsbh = #{orderInfo.ghfNsrsbh,jdbcType=VARCHAR}, + + + + oii.ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR}, + + + oii.ghf_sj = #{orderInfo.ghfSj,jdbcType=VARCHAR}, + + + where oi.ent_id = #{orderInfo.entId,jdbcType=VARCHAR} and op.ddzt in ('0','1','2','3') and op.order_status = '0' + + + - - + + - - + +