czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

反扫调试结束

Browse Source
This commit is contained in:
lyf
2023-02-03 14:45:03 +08:00
parent b9b0330659
commit 496b5bce2e
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java
View File

@@ -9,7 +9,7 @@ import lombok.Data;
@Data
public class MerChantOrderDTO {
/**
* 0 扫码 1现金 2：会员卡
* 0 扫码 1现金 2：会员卡 1、反扫收款；2、收款码；3、会员充值；4、POS；5、反扫会员充值；6、扫码王、QR68机具收款 7：H5 8：升级收费 9小程序 10表示小程序线上店订单 11:缴费通 99 插件
*/
private String type;
//订单编号

12
pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java
View File

@@ -16,11 +16,15 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
//@TableName("(\n" +
// " SELECT t1.*, t2.updateTime refundTime, IFNULL(wo.total_fee - wo.final_fee, IFNULL(wpo.total_fee - wpo.final_fee, 0)) coupon FROM tb_pluss_merchant_order t1\n" +
// " LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2\n" +
// " LEFT JOIN `syblife`.ims_tiny_wmall_order wo ON t1.orderNumber = wo.transaction_id AND t1.orderType = 10\n" +
// " LEFT JOIN `syblife`.ims_tiny_wmall_paybill_order wpo ON t1.orderNumber = wpo.transaction_id AND t1.orderType != 10" +
// " ) t")
@TableName("(\n" +
" SELECT t1.*, t2.updateTime refundTime, IFNULL(wo.total_fee - wo.final_fee, IFNULL(wpo.total_fee - wpo.final_fee, 0)) coupon FROM tb_pluss_merchant_order t1\n" +
" SELECT t1.*, t2.updateTime refundTime FROM tb_pluss_merchant_order t1\n" +
" LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2\n" +
" LEFT JOIN `syblife`.ims_tiny_wmall_order wo ON t1.orderNumber = wo.transaction_id AND t1.orderType = 10\n" +
" LEFT JOIN `syblife`.ims_tiny_wmall_paybill_order wpo ON t1.orderNumber = wpo.transaction_id AND t1.orderType != 10" +
" ) t")
@Accessors(chain = true)
public class MerchantOrderVO extends MerchantOrder {
@@ -54,7 +58,7 @@ public class MerchantOrderVO extends MerchantOrder {
/**
* 优惠金额
*/
private BigDecimal coupon;
// private BigDecimal coupon;
public static void setD0Fee(MerchantOrderVO item) {