Skip to content

O
oms
Commit e6f16ae3 authored by Quxl's avatar Quxl
Browse files
Options

c

parent 48dffce2
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 14 deletions
src/main/java/com/egolm/oms/controller/OrderController.java
View file @ e6f16ae3
...@@ -66,7 +66,7 @@ public class OrderController { ...@@ -66,7 +66,7 @@ public class OrderController {
@ApiOperation("订单正式提交(JSON格式)") @ApiOperation("订单正式提交(JSON格式)")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(paramType = "query", name="data", dataType = "String", required = false, value = "JSON格式", defaultValue = "{\"shopNO\": \"00029975\",\"terminal\": \"wechat\",\"langID\": \"936\",\"payTypeID\":1,\"addrID\":\"111111\",\"orderMemo\":\"备注\",\"couponNO\":\"\",\"couponTypeID\":\"\", \"bankType\": \"xxx\", 'bankAccount': 'xxx', 'formId': 'xxx', 'email': 'xxx', 'salesmanNo': 'xxx'}"), @ApiImplicitParam(paramType = "query", name="data", dataType = "String", required = false, value = "JSON格式", defaultValue = "{\"shopNO\": \"00029975\",\"terminal\": \"wechat\",\"langID\": \"936\",\"payTypeID\":1,\"addrID\":\"111111\",\"orderMemo\":\"备注\",\"couponNO\":\"\",\"couponTypeID\":\"\", \"bankType\": \"xxx\", 'bankAccount': 'xxx', 'bankAccountName': 'xxx', 'revBankType': 'xxx', 'revBankAccount': 'xxx', 'revBankAccountNo': 'xxx', 'formId': 'xxx', 'email': 'xxx', 'salesmanNo': 'xxx'}"),
@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"), @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),
@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"), @ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = false, value = "语言", defaultValue = "936"),
}) })
...@@ -244,12 +244,16 @@ public class OrderController { ...@@ -244,12 +244,16 @@ public class OrderController {
@ApiImplicitParam(paramType = "query", name="formId", dataType = "String", required = true, value=""), @ApiImplicitParam(paramType = "query", name="formId", dataType = "String", required = true, value=""),
@ApiImplicitParam(paramType = "query", name="bankType", dataType = "String", required = true, value="银行"), @ApiImplicitParam(paramType = "query", name="bankType", dataType = "String", required = true, value="银行"),
@ApiImplicitParam(paramType = "query", name="bankAccount", dataType = "String", required = true, value="银行账号"), @ApiImplicitParam(paramType = "query", name="bankAccount", dataType = "String", required = true, value="银行账号"),
@ApiImplicitParam(paramType = "query", name="bankAccountName", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankType", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankAccount", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankAccountNo", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="memo", dataType = "String", required = true, value="备注"), @ApiImplicitParam(paramType = "query", name="memo", dataType = "String", required = true, value="备注"),
@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"), @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),
@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), @ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"),
}) })
public String submitByGroup(String orgNo, String shopNo, String promoPaperNO, String promoGroupNO, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo) { public String submitByGroup(String orgNo, String shopNo, String promoPaperNO, String promoGroupNO, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo) {
String sSalesOrderID = orderService.submitByGroup(orgNo, shopNo, promoPaperNO, promoGroupNO, saleQty, addrId, payTypeId, terminal, salesmanNo, formId, bankType, bankAccount, memo); String sSalesOrderID = orderService.submitByGroup(orgNo, shopNo, promoPaperNO, promoGroupNO, saleQty, addrId, payTypeId, terminal, salesmanNo, formId, bankType, bankAccount, bankAccountName, revBankType, revBankAccount, revBankAccountNo, memo);
return Rjx.jsonOk().set("sSalesOrderID", sSalesOrderID).toJson(); return Rjx.jsonOk().set("sSalesOrderID", sSalesOrderID).toJson();
} }
...@@ -266,12 +270,16 @@ public class OrderController { ...@@ -266,12 +270,16 @@ public class OrderController {
@ApiImplicitParam(paramType = "query", name="formId", dataType = "String", required = true, value=""), @ApiImplicitParam(paramType = "query", name="formId", dataType = "String", required = true, value=""),
@ApiImplicitParam(paramType = "query", name="bankType", dataType = "String", required = true, value="银行"), @ApiImplicitParam(paramType = "query", name="bankType", dataType = "String", required = true, value="银行"),
@ApiImplicitParam(paramType = "query", name="bankAccount", dataType = "String", required = true, value="银行账号"), @ApiImplicitParam(paramType = "query", name="bankAccount", dataType = "String", required = true, value="银行账号"),
@ApiImplicitParam(paramType = "query", name="bankAccountName", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankType", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankAccount", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankAccountNo", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="memo", dataType = "String", required = true, value="备注"), @ApiImplicitParam(paramType = "query", name="memo", dataType = "String", required = true, value="备注"),
@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"), @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),
@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), @ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"),
}) })
public String submitByZhc(String orgNo, String shopNo, Integer planId, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo) { public String submitByZhc(String orgNo, String shopNo, Integer planId, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo) {
String sSalesOrderID = orderService.submitByZhc(orgNo, shopNo, planId, saleQty, addrId, payTypeId, terminal, salesmanNo, formId, bankType, bankAccount, memo); String sSalesOrderID = orderService.submitByZhc(orgNo, shopNo, planId, saleQty, addrId, payTypeId, terminal, salesmanNo, formId, bankType, bankAccount, bankAccountName, revBankType, revBankAccount, revBankAccountNo, memo);
return Rjx.jsonOk().set("sSalesOrderID", sSalesOrderID).toJson(); return Rjx.jsonOk().set("sSalesOrderID", sSalesOrderID).toJson();
} }
...@@ -290,12 +298,16 @@ public class OrderController { ...@@ -290,12 +298,16 @@ public class OrderController {
@ApiImplicitParam(paramType = "query", name="formId", dataType = "String", required = true, value=""), @ApiImplicitParam(paramType = "query", name="formId", dataType = "String", required = true, value=""),
@ApiImplicitParam(paramType = "query", name="bankType", dataType = "String", required = true, value="银行"), @ApiImplicitParam(paramType = "query", name="bankType", dataType = "String", required = true, value="银行"),
@ApiImplicitParam(paramType = "query", name="bankAccount", dataType = "String", required = true, value="银行账号"), @ApiImplicitParam(paramType = "query", name="bankAccount", dataType = "String", required = true, value="银行账号"),
@ApiImplicitParam(paramType = "query", name="bankAccountName", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankType", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankAccount", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="revBankAccountNo", dataType = "String"),
@ApiImplicitParam(paramType = "query", name="memo", dataType = "String", required = true, value="备注"), @ApiImplicitParam(paramType = "query", name="memo", dataType = "String", required = true, value="备注"),
@ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"), @ApiImplicitParam(paramType = "query", name = "terminal", dataType = "String", required = true, value = "终端标识", defaultValue = "wechat"),
@ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"), @ApiImplicitParam(paramType = "query", name = "langID", dataType = "String", required = true, value = "语言", defaultValue = "936"),
}) })
public String submitByMdzs(String orgNo, String shopNo, String contractNo, Integer goodsId, Integer saleQty, String addrId, String email, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo) { public String submitByMdzs(String orgNo, String shopNo, String contractNo, Integer goodsId, Integer saleQty, String addrId, String email, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo) {
String sSalesOrderID = orderService.submitByMdzs(orgNo, shopNo, contractNo, goodsId, saleQty, addrId, email, payTypeId, terminal, salesmanNo, formId, bankType, bankAccount, memo); String sSalesOrderID = orderService.submitByMdzs(orgNo, shopNo, contractNo, goodsId, saleQty, addrId, email, payTypeId, terminal, salesmanNo, formId, bankType, bankAccount, bankAccountName, revBankType, revBankAccount, revBankAccountNo, memo);
return Rjx.jsonOk().set("sSalesOrderID", sSalesOrderID).toJson(); return Rjx.jsonOk().set("sSalesOrderID", sSalesOrderID).toJson();
} }
......
src/main/java/com/egolm/oms/model/TSalesOrder.java
View file @ e6f16ae3
...@@ -47,6 +47,10 @@ public class TSalesOrder { ...@@ -47,6 +47,10 @@ public class TSalesOrder {
private String sDeliveryType; private String sDeliveryType;
private String sBankType; private String sBankType;
private String sBankAccount; private String sBankAccount;
private String sBankAccountName;
private String sRevBankType;
private String sRevBankAccount;
private String sRevBankAccountNO;
private String sFormID; private String sFormID;
private String sB2BOrderTypeID; private String sB2BOrderTypeID;
private String sB2BOrderType; private String sB2BOrderType;
...@@ -309,5 +313,29 @@ public class TSalesOrder { ...@@ -309,5 +313,29 @@ public class TSalesOrder {
public void setsB2BOrderType(String sB2BOrderType) { public void setsB2BOrderType(String sB2BOrderType) {
this.sB2BOrderType = sB2BOrderType; this.sB2BOrderType = sB2BOrderType;
} }
public String getsBankAccountName() {
return sBankAccountName;
}
public void setsBankAccountName(String sBankAccountName) {
this.sBankAccountName = sBankAccountName;
}
public String getsRevBankType() {
return sRevBankType;
}
public void setsRevBankType(String sRevBankType) {
this.sRevBankType = sRevBankType;
}
public String getsRevBankAccount() {
return sRevBankAccount;
}
public void setsRevBankAccount(String sRevBankAccount) {
this.sRevBankAccount = sRevBankAccount;
}
public String getsRevBankAccountNO() {
return sRevBankAccountNO;
}
public void setsRevBankAccountNO(String sRevBankAccountNO) {
this.sRevBankAccountNO = sRevBankAccountNO;
}
} }
src/main/java/com/egolm/oms/service/OrderService.java
View file @ e6f16ae3
...@@ -26,11 +26,11 @@ public interface OrderService { ...@@ -26,11 +26,11 @@ public interface OrderService {
public void cancelOrder(String sSalesOrderID); public void cancelOrder(String sSalesOrderID);
public String submitByGroup(String orgNo, String shopNo, String prompPaperNO, String promoGroupNO, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo); public String submitByGroup(String orgNo, String shopNo, String prompPaperNO, String promoGroupNO, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo);
public String submitByZhc(String orgNo, String shopNo, Integer planId, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo); public String submitByZhc(String orgNo, String shopNo, Integer planId, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo);
public String submitByMdzs(String orgNo, String shopNo, String contractNo, Integer goodsId, Integer saleQty, String addrId, String email, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo); public String submitByMdzs(String orgNo, String shopNo, String contractNo, Integer goodsId, Integer saleQty, String addrId, String email, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo);
public void confirmReceipt(String custNo, String subOrderID); public void confirmReceipt(String custNo, String subOrderID);
......
src/main/java/com/egolm/oms/service/impl/OrderServiceImpl.java
View file @ e6f16ae3
...@@ -100,10 +100,18 @@ public class OrderServiceImpl implements OrderService { ...@@ -100,10 +100,18 @@ public class OrderServiceImpl implements OrderService {
String formId = submitObj.getString("formId"); String formId = submitObj.getString("formId");
String bankType = submitObj.getString("bankType"); String bankType = submitObj.getString("bankType");
String bankAccount = submitObj.getString("bankAccount"); String bankAccount = submitObj.getString("bankAccount");
String bankAccountName = submitObj.getString("bankAccountName");
String revBankType = submitObj.getString("revBankType");
String revBankAccount = submitObj.getString("revBankAccount");
String revBankAccountNo = submitObj.getString("revBankAccountNo");
String email = submitObj.getString("email"); String email = submitObj.getString("email");
String salesmanNo = submitObj.getString("salesmanNo"); String salesmanNo = submitObj.getString("salesmanNo");
bankAccountName = StringUtil.isBlank(bankAccountName) ? "" : bankAccountName;
revBankType = StringUtil.isBlank(revBankType) ? "" : revBankType;
revBankAccount = StringUtil.isBlank(revBankAccount) ? "" : revBankAccount;
revBankAccountNo = StringUtil.isBlank(revBankAccountNo) ? "" : revBankAccountNo;
String sql = "exec up_NewCreatetSalesOrder '" + shopNO + "',null, '" + payID + "', '" + terminalTypeID + "', '" + addrID + "', '" + orderMemo + "', '" + couponNO + "','" + couponTypeID + "', '', '1', '" + (bankType == null ? "" : bankType) + "', '" + (bankAccount == null ? "" : bankAccount) + "'"; String sql = "exec up_NewCreatetSalesOrder '" + shopNO + "',null, '" + payID + "', '" + terminalTypeID + "', '" + addrID + "', '" + orderMemo + "', '" + couponNO + "','" + couponTypeID + "', '', '1', '" + (bankType == null ? "" : bankType) + "', '" + (bankAccount == null ? "" : bankAccount) + "', '" + bankAccountName + "', '" + revBankType + "', '" + revBankAccount + "', '" + revBankAccountNo + "'";
List<Map<String, Object>> commitMap = jdbcTemplate.executeMutil(sql).getDatas().get(0); List<Map<String, Object>> commitMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
if (commitMap != null && commitMap.size() > 0 && commitMap.get(0) != null && Util.objTo(commitMap.get(0).get("Status"), Integer.class) == 0 && Util.objTo(commitMap.get(commitMap.size()-1).get("Status"), Integer.class) == 0) { if (commitMap != null && commitMap.size() > 0 && commitMap.get(0) != null && Util.objTo(commitMap.get(0).get("Status"), Integer.class) == 0 && Util.objTo(commitMap.get(commitMap.size()-1).get("Status"), Integer.class) == 0) {
String sSalesOrderID = (String)commitMap.get(0).get("SalesOrderID"); String sSalesOrderID = (String)commitMap.get(0).get("SalesOrderID");
...@@ -301,7 +309,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -301,7 +309,7 @@ public class OrderServiceImpl implements OrderService {
@Override @Override
@Transactional @Transactional
public String submitByGroup(String orgNo, String shopNo, String promoPaperNO, String promoGroupNO, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo) { public String submitByGroup(String orgNo, String shopNo, String promoPaperNO, String promoGroupNO, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo) {
XException.assertNotBlank(orgNo, "OrgNO不能为空"); XException.assertNotBlank(orgNo, "OrgNO不能为空");
XException.assertNotBlank(shopNo, "ShopNO不能为空"); XException.assertNotBlank(shopNo, "ShopNO不能为空");
XException.assertNotBlank(promoPaperNO, "PromoPaperNO不能为空"); XException.assertNotBlank(promoPaperNO, "PromoPaperNO不能为空");
...@@ -434,6 +442,10 @@ public class OrderServiceImpl implements OrderService { ...@@ -434,6 +442,10 @@ public class OrderServiceImpl implements OrderService {
order.setsAddrID(addrId); order.setsAddrID(addrId);
order.setsBankType(bankType); order.setsBankType(bankType);
order.setsBankAccount(bankAccount); order.setsBankAccount(bankAccount);
order.setsBankAccountName(bankAccountName);
order.setsRevBankType(revBankType);
order.setsRevBankAccount(revBankAccount);
order.setsRevBankAccountNO(revBankAccountNo);
order.setsDeliveryType("送货"); order.setsDeliveryType("送货");
order.setsDeliveryTypeID("1"); order.setsDeliveryTypeID("1");
order.setsSalesOrderPayTypeID(payTypeId); order.setsSalesOrderPayTypeID(payTypeId);
...@@ -495,7 +507,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -495,7 +507,7 @@ public class OrderServiceImpl implements OrderService {
@Override @Override
@Transactional @Transactional
public String submitByZhc(String orgNo, String shopNo, Integer planId, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo) { public String submitByZhc(String orgNo, String shopNo, Integer planId, Integer saleQty, String addrId, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo) {
XException.assertNotBlank(orgNo, "OrgNO不能为空"); XException.assertNotBlank(orgNo, "OrgNO不能为空");
XException.assertNotBlank(shopNo, "ShopNO不能为空"); XException.assertNotBlank(shopNo, "ShopNO不能为空");
...@@ -592,6 +604,10 @@ public class OrderServiceImpl implements OrderService { ...@@ -592,6 +604,10 @@ public class OrderServiceImpl implements OrderService {
order.setsAddrID(addrId); order.setsAddrID(addrId);
order.setsBankType(bankType); order.setsBankType(bankType);
order.setsBankAccount(bankAccount); order.setsBankAccount(bankAccount);
order.setsBankAccountName(bankAccountName);
order.setsRevBankType(revBankType);
order.setsRevBankAccount(revBankAccount);
order.setsRevBankAccountNO(revBankAccountNo);
order.setsDeliveryType("送货"); order.setsDeliveryType("送货");
order.setsDeliveryTypeID("1"); order.setsDeliveryTypeID("1");
order.setsSalesOrderPayTypeID(payTypeId); order.setsSalesOrderPayTypeID(payTypeId);
...@@ -648,7 +664,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -648,7 +664,7 @@ public class OrderServiceImpl implements OrderService {
} }
@Override @Override
public String submitByMdzs(String orgNo, String shopNo, String contractNo, Integer goodsId, Integer saleQty, String addrId, String email, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String memo) { public String submitByMdzs(String orgNo, String shopNo, String contractNo, Integer goodsId, Integer saleQty, String addrId, String email, String payTypeId, String terminal, String salesmanNo, String formId, String bankType, String bankAccount, String bankAccountName, String revBankType, String revBankAccount, String revBankAccountNo, String memo) {
XException.assertNotBlank(orgNo, "OrgNO不能为空"); XException.assertNotBlank(orgNo, "OrgNO不能为空");
XException.assertNotBlank(shopNo, "ShopNO不能为空"); XException.assertNotBlank(shopNo, "ShopNO不能为空");
XException.assertNotBlank(contractNo, "ContractNO不能为空"); XException.assertNotBlank(contractNo, "ContractNO不能为空");
...@@ -725,6 +741,10 @@ public class OrderServiceImpl implements OrderService { ...@@ -725,6 +741,10 @@ public class OrderServiceImpl implements OrderService {
order.setsAddrID(addrId); order.setsAddrID(addrId);
order.setsBankType(bankType); order.setsBankType(bankType);
order.setsBankAccount(bankAccount); order.setsBankAccount(bankAccount);
order.setsBankAccountName(bankAccountName);
order.setsRevBankType(revBankType);
order.setsRevBankAccount(revBankAccount);
order.setsRevBankAccountNO(revBankAccountNo);
order.setsDeliveryType("送货"); order.setsDeliveryType("送货");
order.setsDeliveryTypeID("1"); order.setsDeliveryTypeID("1");
order.setsSalesOrderPayTypeID(payTypeId); order.setsSalesOrderPayTypeID(payTypeId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment