fix:超市购物卡支付、选择钱包、称重商品小数精度不够的问题
This commit is contained in:
1 parent
b738fdc654
commit
8b5f776f1a
12 files changed
+125
-53
No files matched your search
+5
-2
@@ -28,6 +28,7 @@ public enum HardPayTypeEnum {
|
||||
ALI_SELF_QR_CODE_PAY("11", "支付宝付款码支付"),
|
||||
ZYY("12", "中医院"),
|
||||
RMYY("13", "人民医院"),
|
||||
CSXFK("14", "超市消费卡"),
|
||||
;
|
||||
private final String type;
|
||||
private final String description;
|
||||
@@ -42,7 +43,8 @@ public enum HardPayTypeEnum {
|
||||
WECHANT_SELF_QR_CODE_PAY,
|
||||
ALI_SELF_QR_CODE_PAY,
|
||||
ZYY,
|
||||
RMYY
|
||||
RMYY,
|
||||
CSXFK
|
||||
);
|
||||
|
||||
public static final List<HardPayTypeEnum> isNotWalletPay = List.of(
|
||||
@@ -62,7 +64,8 @@ public enum HardPayTypeEnum {
|
||||
public static final List<HardPayTypeEnum> isOffline = List.of(
|
||||
CASH,
|
||||
ZYY,
|
||||
RMYY
|
||||
RMYY,
|
||||
CSXFK
|
||||
);
|
||||
|
||||
public static HardPayTypeEnum valueOfByType(String type) {
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ public class Drawing2D {
|
||||
* static const mm80_Old = 500;
|
||||
* static const mm80 = 570;
|
||||
*/
|
||||
private final int canvasWidth = 340;
|
||||
private final int canvasWidth = 365;
|
||||
private final int canvasHeight = 200;
|
||||
|
||||
private int currentWidth = canvasWidth;
|
||||
|
||||
+8
@@ -4,6 +4,8 @@ import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
|
||||
import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
|
||||
import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
|
||||
import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
|
||||
import com.bsd.pjcloud.wallet.api.vo.base.BaseWalletInterface;
|
||||
import com.bsd.pjcloud.wallet.api.vo.base.BaseWalletTypeInterface;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
@@ -61,4 +63,10 @@ public class HardOrderVo extends HardOrderEntity implements BaseUserDeptInterfac
|
||||
private Long afterSaleId;
|
||||
|
||||
private String afterSaleNo;
|
||||
|
||||
/**
|
||||
* 钱包相关
|
||||
*/
|
||||
private String walletTypeUniqueCode;
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user