|
@@ -80,7 +80,7 @@ public class TOrderController {
|
|
TShandeMchService shandeMchService;
|
|
TShandeMchService shandeMchService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private THuifuMchService huifuMchService;
|
|
|
|
|
|
+ THuifuMchService huifuMchService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
TEquipmentService equipmentService;
|
|
TEquipmentService equipmentService;
|
|
@@ -277,6 +277,7 @@ public class TOrderController {
|
|
order.setType(admin.getType());
|
|
order.setType(admin.getType());
|
|
order.setProductNumber(productNumber);
|
|
order.setProductNumber(productNumber);
|
|
order.setCompanyType(admin.getCompanyType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
|
|
+ order.setMachineType(equipment.getMachineType());
|
|
if(admin.getType()==0){
|
|
if(admin.getType()==0){
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
@@ -536,6 +537,7 @@ public class TOrderController {
|
|
order.setType(admin.getType());
|
|
order.setType(admin.getType());
|
|
order.setProductNumber(productNumber);
|
|
order.setProductNumber(productNumber);
|
|
order.setCompanyType(admin.getCompanyType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
|
|
+ order.setMachineType(equipment.getMachineType());
|
|
if(admin.getType()==0){
|
|
if(admin.getType()==0){
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
@@ -771,6 +773,7 @@ public class TOrderController {
|
|
order.setStatus(0);
|
|
order.setStatus(0);
|
|
order.setType(admin.getType());
|
|
order.setType(admin.getType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
|
|
+ order.setMachineType(equipment.getMachineType());
|
|
if(admin.getType()==0){
|
|
if(admin.getType()==0){
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
@@ -813,6 +816,7 @@ public class TOrderController {
|
|
order2.setStatus(0);
|
|
order2.setStatus(0);
|
|
order2.setPayPlatform(payPlatform);
|
|
order2.setPayPlatform(payPlatform);
|
|
order2.setCompanyType(admin.getCompanyType());
|
|
order2.setCompanyType(admin.getCompanyType());
|
|
|
|
+ order2.setMachineType(equipment.getMachineType());
|
|
if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
|
|
if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
|
|
order2.setIsSettlement("0");
|
|
order2.setIsSettlement("0");
|
|
}
|
|
}
|
|
@@ -1161,6 +1165,7 @@ public class TOrderController {
|
|
order.setStatus(0);
|
|
order.setStatus(0);
|
|
order.setType(admin.getType());
|
|
order.setType(admin.getType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
|
|
+ order.setCompanyType(admin.getCompanyType());
|
|
if(admin.getType()==0){
|
|
if(admin.getType()==0){
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
@@ -1203,6 +1208,7 @@ public class TOrderController {
|
|
order2.setProductNumber(productNumber);
|
|
order2.setProductNumber(productNumber);
|
|
order.setType(admin.getType());
|
|
order.setType(admin.getType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
|
|
+ order2.setMachineType(equipment.getMachineType());
|
|
if(admin.getType()==0){
|
|
if(admin.getType()==0){
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAdminProportion(proportion.getAdminProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
order.setAgencyProportion(proportion.getAgencyProportion());
|
|
@@ -1649,6 +1655,7 @@ public class TOrderController {
|
|
order.setMarketingAmount(marketingAmount);
|
|
order.setMarketingAmount(marketingAmount);
|
|
order.setProductNumber(productNumber);
|
|
order.setProductNumber(productNumber);
|
|
order.setCompanyType(admin.getCompanyType());
|
|
order.setCompanyType(admin.getCompanyType());
|
|
|
|
+ order.setMachineType(equipment.getMachineType());
|
|
if(couponList.size()>0){
|
|
if(couponList.size()>0){
|
|
order.setCoupons(couponList.toString());
|
|
order.setCoupons(couponList.toString());
|
|
}
|
|
}
|