xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2020-10-23 22:50:47 +08:00
parent 9a602b3df3
commit 7a64083b64
7 changed files with 341 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssjygl-xsx-common/src/main/java/com/cowr/model/OrderInvalidVerify.java Normal file
View File

@ -0,0 +1,14 @@
package com.cowr.model;
import com.cowr.model.base.BaseOrderInvalidVerify;
/**
* Generated by COWR Fri Oct 23 17:41:42 CST 2020
* TableName: order_invalid_verify
* Remarks: 订单相关 - 订单作废申请
* PrimaryKey: id
*/
@SuppressWarnings("serial")
public class OrderInvalidVerify extends BaseOrderInvalidVerify<OrderInvalidVerify> {
public static final OrderInvalidVerify dao = new OrderInvalidVerify().dao();
}

1
ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java
View File

@ -70,6 +70,7 @@ public class _MappingKit {
arp.addMapping("order_trash", "sn", OrderTrash.class);
arp.addMapping("stock_modify_log", "id", StockModifyLog.class);
arp.addMapping("ordercluster_truck", "id", OrderclusterTruck.class);
arp.addMapping("order_invalid_verify", "id", OrderInvalidVerify.class);
arp.addMapping("ordercluster", "id", Ordercluster.class);
arp.addMapping("order_transfer", "sn", OrderTransfer.class);
arp.addMapping("order_sale", "sn", OrderSale.class);

316
ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java Normal file
View File

@ -0,0 +1,316 @@
package com.cowr.model.base;
import com.cowr.common.base.BaseModel;
import com.jfinal.plugin.activerecord.IBean;
import com.alibaba.fastjson.annotation.JSONField;
/**
* Generated by COWR Fri Oct 23 17:41:42 CST 2020
* TableName: order_invalid_verify
* Remarks: 订单相关 - 订单作废申请
* PrimaryKey: id
*/
@SuppressWarnings("serial")
public abstract class BaseOrderInvalidVerify<M extends BaseOrderInvalidVerify<M>> extends BaseModel<M> implements IBean {
public static final String tablename = "order_invalid_verify";
@JSONField(serialize=false)
public String getTablename(){
return tablename;
}
/**
* name: id
* type: CHAR(32)
* isNullable: NO
* isPrimaryKey: YES
* defaultValue:
* @param id uuid
*/
@JSONField(name="id")
public void setId(String id) {
set("id", id);
}
/**
* @return id uuid
*/
@JSONField(name="id")
public String getId() {
return getStr("id");
}
/**
* name: create_time
* type: DATETIME(19)
* isNullable: NO
* isPrimaryKey: NO
* defaultValue:
* @param createTime 创建时间
*/
@JSONField(name="create_time")
public void setCreateTime(java.util.Date createTime) {
set("create_time", createTime);
}
/**
* @return create_time 创建时间
*/
@JSONField(name="create_time")
public java.util.Date getCreateTime() {
return get("create_time");
}
/**
* name: change_time
* type: TIMESTAMP(19)
* isNullable: NO
* isPrimaryKey: NO
* defaultValue: CURRENT_TIMESTAMP
* @param changeTime 最后修改时间
*/
@JSONField(name="change_time")
public void setChangeTime(java.util.Date changeTime) {
set("change_time", changeTime);
}
/**
* @return change_time 最后修改时间
*/
@JSONField(name="change_time")
public java.util.Date getChangeTime() {
return get("change_time");
}
/**
* name: state
* type: INT(10)
* isNullable: NO
* isPrimaryKey: NO
* defaultValue: 1
* @param state 付费状态。
1.提交、待审核
2.审核通过，计入余额
9.作废
*/
@JSONField(name="state")
public void setState(Integer state) {
set("state", state);
}
/**
* @return state 付费状态。
1.提交、待审核
2.审核通过，计入余额
9.作废
*/
@JSONField(name="state")
public Integer getState() {
return getInt("state");
}
/**
* name: create_user_id
* type: INT(10)
* isNullable: NO
* isPrimaryKey: NO
* defaultValue:
* @param createUserId 创建用户id
*/
@JSONField(name="create_user_id")
public void setCreateUserId(Integer createUserId) {
set("create_user_id", createUserId);
}
/**
* @return create_user_id 创建用户id
*/
@JSONField(name="create_user_id")
public Integer getCreateUserId() {
return getInt("create_user_id");
}
/**
* name: create_user_name
* type: VARCHAR(255)
* isNullable: NO
* isPrimaryKey: NO
* defaultValue:
* @param createUserName 创建用户姓名
*/
@JSONField(name="create_user_name")
public void setCreateUserName(String createUserName) {
set("create_user_name", createUserName);
}
/**
* @return create_user_name 创建用户姓名
*/
@JSONField(name="create_user_name")
public String getCreateUserName() {
return getStr("create_user_name");
}
/**
* name: verify_user_id
* type: INT(10)
* isNullable: YES
* isPrimaryKey: NO
* defaultValue:
* @param verifyUserId 审核用户id
*/
@JSONField(name="verify_user_id")
public void setVerifyUserId(Integer verifyUserId) {
set("verify_user_id", verifyUserId);
}
/**
* @return verify_user_id 审核用户id
*/
@JSONField(name="verify_user_id")
public Integer getVerifyUserId() {
return getInt("verify_user_id");
}
/**
* name: verify_user_name
* type: VARCHAR(255)
* isNullable: YES
* isPrimaryKey: NO
* defaultValue:
* @param verifyUserName 审核用户姓名
*/
@JSONField(name="verify_user_name")
public void setVerifyUserName(String verifyUserName) {
set("verify_user_name", verifyUserName);
}
/**
* @return verify_user_name 审核用户姓名
*/
@JSONField(name="verify_user_name")
public String getVerifyUserName() {
return getStr("verify_user_name");
}
/**
* name: order_sn
* type: CHAR(16)
* isNullable: NO
* isPrimaryKey: NO
* defaultValue:
* @param orderSn 关联订单号
*/
@JSONField(name="order_sn")
public void setOrderSn(String orderSn) {
set("order_sn", orderSn);
}
/**
* @return order_sn 关联订单号
*/
@JSONField(name="order_sn")
public String getOrderSn() {
return getStr("order_sn");
}
/**
* name: type
* type: SMALLINT(5)
* isNullable: YES
* isPrimaryKey: NO
* defaultValue:
* @param type 1、2、3、4、5
*/
@JSONField(name="type")
public void setType(Integer type) {
set("type", type);
}
/**
* @return type 1、2、3、4、5
*/
@JSONField(name="type")
public Integer getType() {
return getInt("type");
}
/**
* name: supermarket_id
* type: INT(10)
* isNullable: YES
* isPrimaryKey: NO
* defaultValue:
* @param supermarketId 超市id
*/
@JSONField(name="supermarket_id")
public void setSupermarketId(Integer supermarketId) {
set("supermarket_id", supermarketId);
}
/**
* @return supermarket_id 超市id
*/
@JSONField(name="supermarket_id")
public Integer getSupermarketId() {
return getInt("supermarket_id");
}
/**
* name: invalid_memo
* type: VARCHAR(255)
* isNullable: NO
* isPrimaryKey: NO
* defaultValue:
* @param invalidMemo 作废申请说明
*/
@JSONField(name="invalid_memo")
public void setInvalidMemo(String invalidMemo) {
set("invalid_memo", invalidMemo);
}
/**
* @return invalid_memo 作废申请说明
*/
@JSONField(name="invalid_memo")
public String getInvalidMemo() {
return getStr("invalid_memo");
}
/**
* name: memo
* type: VARCHAR(255)
* isNullable: YES
* isPrimaryKey: NO
* defaultValue:
* @param memo 审核说明
*/
@JSONField(name="memo")
public void setMemo(String memo) {
set("memo", memo);
}
/**
* @return memo 审核说明
*/
@JSONField(name="memo")
public String getMemo() {
return getStr("memo");
}
}

2
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/supermarketproduct/CustomerSupermarketProductService.java
View File

@ -85,7 +85,7 @@ public class CustomerSupermarketProductService extends BaseService {
String selectsql = " select a.customer_id, c.name customer_name ";
String fromsql = " from (\n" +
" select t.*\n" +
" select t.customer_id \n" +
" from customer_supermarket_product t\n" +
" group by t.customer_id\n" +
" ) a\n" +

9
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
View File

@ -58,9 +58,12 @@ public class OrderTempService extends BaseService {
", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" +
", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" +
", p.arrive_time, p.type, p.memo transport_memo \n" +
", s.name supermarket_name from order_temp t \n" +
", s.name supermarket_name \n" +
", v.state invoice_invalid_verify_state \n" +
" from order_temp t \n" +
" left join transport p on p.order_sn = t.sn \n" +
" left join supermarket s on s.id = t.supermarket_id \n" +
" left join invoice_invalid_verify v on v.order_sn = t.sn and v.state = 1 \n" +
" where t.sn = ?", sn);
}
@ -84,10 +87,12 @@ public class OrderTempService extends BaseService {
", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" +
", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" +
", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" +
", p.arrive_time, p.type, p.memo transport_memo, s.name supermarket_name \n";
", p.arrive_time, p.type, p.memo transport_memo, s.name supermarket_name \n" +
", v.state invoice_invalid_verify_state \n";
String fromsql = "from order_temp t \n" +
" left join transport p on p.order_sn = t.sn \n" +
" left join supermarket s on s.id = t.supermarket_id \n" +
" left join invoice_invalid_verify v on v.order_sn = t.sn and v.state = 1 \n" +
" where 1=1 ";
List<Object> paraList = new ArrayList<>();

1
ssjygl-xsx-common/src/main/java/generator/Main.java
View File

@ -77,6 +77,7 @@ public class Main {
"customer_pact",
"customer_supermarket_product",
"invoice_invalid_verify",
"order_invalid_verify",
};
PropKit.use("db.properties");

2
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/invoice/invalidverify/InvoiceInvalidVerifySyncService.java
View File

@ -36,7 +36,7 @@ public class InvoiceInvalidVerifySyncService {
}
InvoiceInvalidVerify old = InvoiceInvalidVerify.dao.findFirst(
"select * from invoice_invalid_verify t where t.state = ? and t.order_sn = ?", 1, order_sn);
"select * from invoice_invalid_verify t where t.state = ? and t.order_sn = ? limit 1", 1, order_sn);
if (old != null) {
return Result.failedstr("订单 %s 已提交申请", order_sn);