订单添加设备类型字段

src/main/java/com/szwl/controller/TOrderController.java

@@ -315,9 +315,10 @@ public class TOrderController {
         orderDetails.setAmount(price);
         orderDetails.setRefundStatus("0");
         orderDetails.setCompanyType(admin.getCompanyType());
+        orderDetails.setMachineType(equipment.getMachineType());
 
-//        String client6 = clientId.substring(clientId.length() - 6, clientId.length());
-//        productName = productName + "-" + equipment.getName() + "-" + client6;
+        String client6 = clientId.substring(clientId.length() - 6);
+        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             // 汇付分账参数
@@ -341,7 +342,7 @@ public class TOrderController {
             // 汇付支付
             try {
                 result = huifuMchService.uniPay(
-                        orderNo, amount, productName, productDesc,
+                        orderNo, amount, productName1, productDesc,
                         notifyUrl, frpCode, openId, appid, acctSplitBunch
                 );
             } catch (Exception e) {
@@ -361,7 +362,7 @@ public class TOrderController {
         }else{
             try {
                 result = joinpayMchService.uniPay(
-                        orderNo, amount, productName, productDesc,
+                        orderNo, amount, productName1, productDesc,
                         commonParameter, returnUrl, notifyUrl, frpCode,
                         isShowPic, openId, authCode, appid, transactionModel, tradeMerchantNo,
                         buyerId, isAlt, altType, altInfo, altUrl, marketingAmount
@@ -578,15 +579,16 @@ public class TOrderController {
         orderDetails.setAmount(price);
         orderDetails.setRefundStatus("0");
         orderDetails.setCompanyType(admin.getCompanyType());
+        orderDetails.setMachineType(equipment.getMachineType());
 
-//        String client6 = clientId.substring(clientId.length() - 6, clientId.length());
-//        productName = productName + "-" + equipment.getName() + "-" + client6;
+        String client6 = clientId.substring(clientId.length() - 6);
+        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             order.setAcctSplitBunch(acctSplitBunch.toString());
             try {
                 result = huifuMchService.cardPay(
-                        orderNo, amount, productName, notifyUrl, authCode,  acctSplitBunch
+                        orderNo, amount, productName1, notifyUrl, authCode,  acctSplitBunch
                 );
             } catch (Exception e) {
                 e.printStackTrace();
@@ -604,7 +606,7 @@ public class TOrderController {
         }else{
             try {
                 result = joinpayMchService.uniPay(
-                        orderNo, amount, productName, productDesc,
+                        orderNo, amount, productName1, productDesc,
                         commonParameter, returnUrl, notifyUrl, frpCode,
                         isShowPic, openId, authCode, appid, transactionModel, tradeMerchantNo,
                         buyerId, isAlt, altType, altInfo, altUrl, marketingAmount
@@ -832,9 +834,10 @@ public class TOrderController {
         orderDetails.setAmount(price);
         orderDetails.setCompanyType(admin.getCompanyType());
         orderDetails.setRefundStatus("0");
+        orderDetails.setMachineType(equipment.getMachineType());
 
-//        String client6 = clientId.substring(clientId.length() - 6, clientId.length());
-//        productName = productName + "-" + equipment.getName() + "-" + client6;
+        String client6 = clientId.substring(clientId.length() - 6);
+        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             // 汇付分账参数
@@ -851,7 +854,7 @@ public class TOrderController {
             // 支付宝
             try {
                 result = huifuMchService.uniPay(
-                        sn2, amount, productName, productDesc,
+                        sn2, amount, productName1, productDesc,
                         notifyUrl, frpCode2, openId, appid, acctSplitBunch
                 );
             } catch (Exception e) {
@@ -875,7 +878,7 @@ public class TOrderController {
         }else{
             try {
                 result = joinpayMchService.uniPay(
-                        orderNo1, amount, productName, productDesc,
+                        orderNo1, amount, productName1, productDesc,
                         commonParameter, returnUrl, notifyUrl, frpCode1,
                         isShowPic, openId, authCode, appid, transactionModel, tradeMerchantNo,
                         buyerId, isAlt, altType, altInfo, altUrl, marketingAmount
@@ -919,6 +922,7 @@ public class TOrderController {
         }
 
     }
+
     @ApiOperation(value = "购物车 请求在线支付 二码合一")
     @PostMapping("/carsPay")
     public Object carsPay(String clientId, @RequestBody Map<String,String> productNameMap) {
@@ -1165,7 +1169,7 @@ public class TOrderController {
         order.setStatus(0);
         order.setType(admin.getType());
         order.setCompanyType(admin.getCompanyType());
-        order.setCompanyType(admin.getCompanyType());
+        order.setMachineType(equipment.getMachineType());
         if(admin.getType()==0){
             order.setAdminProportion(proportion.getAdminProportion());
             order.setAgencyProportion(proportion.getAgencyProportion());
@@ -1242,7 +1246,10 @@ public class TOrderController {
         orderDetails.setCreateDate(new Date());
         orderDetails.setCompanyType(admin.getCompanyType());
         orderDetails.setRefundStatus("0");
+        orderDetails.setMachineType(equipment.getMachineType());
 
+        String client6 = clientId.substring(clientId.length() - 6);
+        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             // 汇付分账参数
@@ -1259,7 +1266,7 @@ public class TOrderController {
             // 支付宝
             try {
                 result = huifuMchService.uniPay(
-                        sn2, amount, productName.toString(), productDesc,
+                        sn2, amount, productName1, productDesc,
                         notifyUrl, frpCode2, openId, appid, acctSplitBunch
                 );
             } catch (Exception e) {
@@ -1292,7 +1299,7 @@ public class TOrderController {
         }else{
             try {
                 result = joinpayMchService.uniPay(
-                        orderNo1, amount, productName.toString(), productDesc,
+                        orderNo1, amount, productName1, productDesc,
                         commonParameter, returnUrl, notifyUrl, frpCode1,
                         isShowPic, openId, authCode, appid, transactionModel, tradeMerchantNo,
                         buyerId, isAlt, altType, altInfo, altUrl, marketingAmount
@@ -1306,7 +1313,7 @@ public class TOrderController {
             String result1 = null;
             try {
                 result1 = joinpayMchService.uniPay(
-                        orderNo2, amount, productName.toString(), productDesc,
+                        orderNo2, amount, productName1, productDesc,
                         commonParameter, returnUrl, notifyUrl, frpCode2,
                         isShowPic, openId, authCode, appid, transactionModel, tradeMerchantNo,
                         buyerId, isAlt, altType, altInfo, altUrl, marketingAmount
@@ -1347,6 +1354,7 @@ public class TOrderController {
         }
 
     }
+
     @ApiOperation(value = "购物车 微信小程序支付")
     @PostMapping("/carsPayXCX")
     public Object carsPayXCX(String clientId,String id,String coupons, @RequestBody Map<String,String> productNameMap) {
@@ -1709,13 +1717,16 @@ public class TOrderController {
         orderDetails.setCreateDate(new Date());
         orderDetails.setCompanyType(admin.getCompanyType());
         orderDetails.setRefundStatus("0");
+        orderDetails.setMachineType(equipment.getMachineType());
 
+        String client6 = clientId.substring(clientId.length() - 6);
+        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
         String result = null;
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             order.setAcctSplitBunch(acctSplitBunch.toString());
             try {
                 result = huifuMchService.uniPay(
-                        orderNo1, amount, productName.toString(), productDesc,
+                        orderNo1, amount, productName1, productDesc,
                         notifyUrl, frpCode1, openId, appid, acctSplitBunch
                 );
             } catch (Exception e) {
@@ -1746,7 +1757,7 @@ public class TOrderController {
         }else{
             try {
                 result = joinpayMchService.uniPay(
-                        orderNo1, amount, productName.toString(), productDesc,
+                        orderNo1, amount, productName1, productDesc,
                         commonParameter, returnUrl, notifyUrl, frpCode1,
                         isShowPic, openId, authCode, appid, transactionModel, tradeMerchantNo,
                         buyerId, isAlt, altType, altInfo, altUrl, marketingAmount

src/main/java/com/szwl/mapper/xml/THuifuTempOrderMapper.xml

@@ -29,13 +29,14 @@
         <result column="note" property="note" />
         <result column="pay_platform" property="payPlatform" />
         <result column="proportion_desc" property="proportionDesc" />
-        <result column="order_status" property="orderStatus" />
         <result column="company_type" property="companyType" />
+        <result column="order_status" property="orderStatus" />
+        <result column="machine_type" property="machineType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        sn, id, create_date, price, acct_split_bunch, product_name, product_no, product_number, admin_id, admin_proportion, agency_id, agency_proportion, alt_info, client_id, equipment_id, frp_code, merchant_id, merchant_proportion, personage_id, personage_proportion, status, type, note, pay_platform, proportion_desc, order_status, company_type
+        sn, id, create_date, price, acct_split_bunch, product_name, product_no, product_number, admin_id, admin_proportion, agency_id, agency_proportion, alt_info, client_id, equipment_id, frp_code, merchant_id, merchant_proportion, personage_id, personage_proportion, status, type, note, pay_platform, proportion_desc, company_type, order_status, machine_type
     </sql>
 
 </mapper>

src/main/java/com/szwl/mapper/xml/TOrderDetailsMapper.xml

@@ -18,11 +18,12 @@
         <result column="refund_amout" property="refundAmout" />
         <result column="refund_status" property="refundStatus" />
         <result column="company_type" property="companyType" />
+        <result column="machine_type" property="machineType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, admin_id, equipment_id, create_date, order_sn, product_no, product_name, product_number, price, amount, refund_quantity, refund_amout, refund_status, company_type
+        id, admin_id, equipment_id, create_date, order_sn, product_no, product_name, product_number, price, amount, refund_quantity, refund_amout, refund_status, company_type, machine_type
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/entity/THuifuTempOrder.java

@@ -101,11 +101,14 @@ public class THuifuTempOrder implements Serializable {
     @ApiModelProperty(value = "分账详情，当分账超过4方时，这个字段才启用")
     private String proportionDesc;
 
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
+
     @ApiModelProperty(value = "订单状态；0：排队中，1：正在制作，2：已制作")
     private String orderStatus;
 
-    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
-    private String companyType;
+    @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
+    private String machineType;
 
 
 }

src/main/java/com/szwl/model/entity/TOrderDetails.java

@@ -68,5 +68,8 @@ public class TOrderDetails implements Serializable {
     @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
     private String companyType;
 
+    @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
+    private String machineType;
+
 
 }

src/main/java/com/szwl/service/impl/THuifuMchServiceImpl.java

@@ -115,7 +115,13 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
         request.put("huifu_id", HuifuConstant.DIV_HUIFU_ID);
         request.put("trade_type", "T_JSAPI");
         request.put("trans_amt", huifuTempOrder.getPrice());
-        request.put("goods_desc", huifuTempOrder.getProductName());
+        String clientId = huifuTempOrder.getClientId();
+        String productName = huifuTempOrder.getProductName();
+        TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
+        String client6 = clientId.substring(clientId.length() - 6);
+        String productName1 = productName + "-" + equipment.getName() + "-" + client6;
+        request.put("goods_desc", productName1);
+//        request.put("goods_desc", huifuTempOrder.getProductName());
         request.put("notify_url", HuifuConstant.Notify_Url);
         request.put("remark", huifuTempOrder.getId());
         // 分账明细
@@ -174,6 +180,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
         orderDetails.setCompanyType(huifuTempOrder.getCompanyType());
         orderDetails.setRefundStatus("0");
         orderDetails.setEquipmentId(huifuTempOrder.getEquipmentId());
+        orderDetails.setMachineType(huifuTempOrder.getMachineType());
         if(huifuTempOrder.getProductNumber() != null && huifuTempOrder.getProductNumber() > 1) {
             Map<String, String> map = new HashMap<>();