获取定制商城订单数据

src/main/java/com/uas/erp/schedular/diymall/DiymallConfiguration.java

@@ -1,29 +0,0 @@
-package com.uas.erp.schedular.diymall;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.sql.DataSource;
-
-/**
- * Created by 黄诚天 on 2017-12-23.
- */
-
-@Configuration
-public class DiymallConfiguration {
-
-    @Bean(name = "secondDatasource")
-    @ConfigurationProperties(prefix = "spring.diymall-datasource")
-    public DataSource secondDataSource() {
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "secondJdbcTemplate")
-    public JdbcTemplate secondJdbcTemplate(@Qualifier("secondDatasource") DataSource dataSource) {
-        return new JdbcTemplate(dataSource);
-    }
-}

src/main/java/com/uas/erp/schedular/diymall/domain/DiymallOrder.java

@@ -0,0 +1,432 @@
+package com.uas.erp.schedular.diymall.domain;
+
+import java.util.Date;
+import java.util.Set;
+
+/**
+ * 定制商城订单主表数据
+ * 
+ * @author huangct
+ * @time 创建时间：2017年12月25日
+ */
+public class DiymallOrder {
+	private Long id;
+
+	private String code;
+
+	private Integer payment;
+
+	private Integer userId;
+
+	private Integer status;
+
+	private Integer display;
+
+	private String takeName;
+
+	private String takePhone;
+
+	private String takePostCode;
+
+	private Integer takeAreaId;
+
+	private String takeAreaMsg;
+
+	private String takeAddress;
+
+	private String toBankNumber;
+
+	private String toBankName;
+
+	private String toBankType;
+
+	private String toBbankAddress;
+
+	private String fromBankNumber;
+
+	private String fromBankName;
+
+	private String remark;
+
+	private String adminRemark;
+
+	private String invoiceName;
+
+	private String invoiceNumber;
+
+	private Integer freightId;
+
+	private Double freightPrice;
+
+	private Double subtotal;
+
+	private Double grandTotal;
+
+	private String trackingCode;
+
+	private String trackingCompany;
+
+	private String trackingKdnCode;
+
+	private Integer trackingStatus;
+
+	private Date trackingUpdateDate;
+
+	private Date createDate;
+
+	private Date paymentDate;
+
+	private Date trackingDate;
+
+	private Date receivedDate;
+
+	private Date finishDate;
+
+	private Date refundDate;
+
+	private Integer synData;
+
+	private Set<DiymallOrderItem> diymallOrderItems;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Integer getPayment() {
+		return payment;
+	}
+
+	public void setPayment(Integer payment) {
+		this.payment = payment;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Integer getDisplay() {
+		return display;
+	}
+
+	public void setDisplay(Integer display) {
+		this.display = display;
+	}
+
+	public String getTakeName() {
+		return takeName;
+	}
+
+	public void setTakeName(String takeName) {
+		this.takeName = takeName;
+	}
+
+	public String getTakePhone() {
+		return takePhone;
+	}
+
+	public void setTakePhone(String takePhone) {
+		this.takePhone = takePhone;
+	}
+
+	public String getTakePostCode() {
+		return takePostCode;
+	}
+
+	public void setTakePostCode(String takePostCode) {
+		this.takePostCode = takePostCode;
+	}
+
+	public Integer getTakeAreaId() {
+		return takeAreaId;
+	}
+
+	public void setTakeAreaId(Integer takeAreaId) {
+		this.takeAreaId = takeAreaId;
+	}
+
+	public String getTakeAreaMsg() {
+		return takeAreaMsg;
+	}
+
+	public void setTakeAreaMsg(String takeAreaMsg) {
+		this.takeAreaMsg = takeAreaMsg;
+	}
+
+	public String getTakeAddress() {
+		return takeAddress;
+	}
+
+	public void setTakeAddress(String takeAddress) {
+		this.takeAddress = takeAddress;
+	}
+
+	public String getToBankNumber() {
+		return toBankNumber;
+	}
+
+	public void setToBankNumber(String toBankNumber) {
+		this.toBankNumber = toBankNumber;
+	}
+
+	public String getToBankName() {
+		return toBankName;
+	}
+
+	public void setToBankName(String toBankName) {
+		this.toBankName = toBankName;
+	}
+
+	public String getToBankType() {
+		return toBankType;
+	}
+
+	public void setToBankType(String toBankType) {
+		this.toBankType = toBankType;
+	}
+
+	public String getToBbankAddress() {
+		return toBbankAddress;
+	}
+
+	public void setToBbankAddress(String toBbankAddress) {
+		this.toBbankAddress = toBbankAddress;
+	}
+
+	public String getFromBankNumber() {
+		return fromBankNumber;
+	}
+
+	public void setFromBankNumber(String fromBankNumber) {
+		this.fromBankNumber = fromBankNumber;
+	}
+
+	public String getFromBankName() {
+		return fromBankName;
+	}
+
+	public void setFromBankName(String fromBankName) {
+		this.fromBankName = fromBankName;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getAdminRemark() {
+		return adminRemark;
+	}
+
+	public void setAdminRemark(String adminRemark) {
+		this.adminRemark = adminRemark;
+	}
+
+	public String getInvoiceName() {
+		return invoiceName;
+	}
+
+	public void setInvoiceName(String invoiceName) {
+		this.invoiceName = invoiceName;
+	}
+
+	public String getInvoiceNumber() {
+		return invoiceNumber;
+	}
+
+	public void setInvoiceNumber(String invoiceNumber) {
+		this.invoiceNumber = invoiceNumber;
+	}
+
+	public Integer getFreightId() {
+		return freightId;
+	}
+
+	public void setFreightId(Integer freightId) {
+		this.freightId = freightId;
+	}
+
+	public Double getFreightPrice() {
+		return freightPrice;
+	}
+
+	public void setFreightPrice(Double freightPrice) {
+		this.freightPrice = freightPrice;
+	}
+
+	public Double getSubtotal() {
+		return subtotal;
+	}
+
+	public void setSubtotal(Double subtotal) {
+		this.subtotal = subtotal;
+	}
+
+	public Double getGrandTotal() {
+		return grandTotal;
+	}
+
+	public void setGrandTotal(Double grandTotal) {
+		this.grandTotal = grandTotal;
+	}
+
+	public String getTrackingCode() {
+		return trackingCode;
+	}
+
+	public void setTrackingCode(String trackingCode) {
+		this.trackingCode = trackingCode;
+	}
+
+	public String getTrackingCompany() {
+		return trackingCompany;
+	}
+
+	public void setTrackingCompany(String trackingCompany) {
+		this.trackingCompany = trackingCompany;
+	}
+
+	public String getTrackingKdnCode() {
+		return trackingKdnCode;
+	}
+
+	public void setTrackingKdnCode(String trackingKdnCode) {
+		this.trackingKdnCode = trackingKdnCode;
+	}
+
+	public Integer getTrackingStatus() {
+		return trackingStatus;
+	}
+
+	public void setTrackingStatus(Integer trackingStatus) {
+		this.trackingStatus = trackingStatus;
+	}
+
+	public Date getTrackingUpdateDate() {
+		return trackingUpdateDate;
+	}
+
+	public void setTrackingUpdateDate(Date trackingUpdateDate) {
+		this.trackingUpdateDate = trackingUpdateDate;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getPaymentDate() {
+		return paymentDate;
+	}
+
+	public void setPaymentDate(Date paymentDate) {
+		this.paymentDate = paymentDate;
+	}
+
+	public Date getTrackingDate() {
+		return trackingDate;
+	}
+
+	public void setTrackingDate(Date trackingDate) {
+		this.trackingDate = trackingDate;
+	}
+
+	public Date getReceivedDate() {
+		return receivedDate;
+	}
+
+	public void setReceivedDate(Date receivedDate) {
+		this.receivedDate = receivedDate;
+	}
+
+	public Date getFinishDate() {
+		return finishDate;
+	}
+
+	public void setFinishDate(Date finishDate) {
+		this.finishDate = finishDate;
+	}
+
+	public Date getRefundDate() {
+		return refundDate;
+	}
+
+	public void setRefundDate(Date refundDate) {
+		this.refundDate = refundDate;
+	}
+
+	public Integer getSynData() {
+		return synData;
+	}
+
+	public void setSynData(Integer synData) {
+		this.synData = synData;
+	}
+
+	public Set<DiymallOrderItem> getDiymallOrderItems() {
+		return diymallOrderItems;
+	}
+
+	public void setDiymallOrderItems(Set<DiymallOrderItem> diymallOrderItems) {
+		this.diymallOrderItems = diymallOrderItems;
+	}
+
+	public String toSqlString(int primaryKey) {
+		return "insert into financingapply (fa_id,fa_enname,fa_contact,fa_telphone,fa_phone,fa_appamount,fa_applyman,fa_applydate,fa_score,fa_busincode,fa_facorpname,fa_facorpcode,fa_finid) values ("
+//				+ primaryKey
+//				+ ",'"
+//				+ StringUtil.nvl(fa_enname, "")
+//				+ "', '"
+//				+ StringUtil.nvl(fa_contact, "")
+//				+ "', '"
+//				+ StringUtil.nvl(fa_telphone, "")
+//				+ "','"
+//				+ StringUtil.nvl(fa_phone, "")
+//				+ "', "
+//				+ NumberUtil.nvl(fa_appamount, 0)
+//				+ ", '"
+//				+  StringUtil.nvl(fa_applyman, "")
+//				+ "', "
+//				+ DateUtil.parseDateToOracleString(null, fa_applydate)
+//				+ ", "
+//				+ fa_score
+//				+ ", '"
+//				+ fa_busincode
+//				+ "', '"
+//				+ fa_facorpname
+//				+ "', '"
+//				+ fa_facorpcode
+//				+ "', "
+//				+ fa_finid
+				+ ")";
+	}
+}

src/main/java/com/uas/erp/schedular/diymall/domain/DiymallOrderItem.java

@@ -0,0 +1,160 @@
+package com.uas.erp.schedular.diymall.domain;
+
+/**
+ * 定制商城订单从表数据
+ *
+ * @author huangct
+ * @time 创建时间：2017年12月25日
+ */
+public class DiymallOrderItem {
+
+    private Integer id;
+
+    private Integer ordersId;
+
+    private Integer userDiyId;
+
+    private String diyTitle;
+
+    private String diyRemark;
+
+    private String diyImgUrl;
+
+    private String diyContent;
+
+    private Integer bottleId;
+
+    private String bottleTitle;
+
+    private Double bottleWeight;
+
+    private Integer bottleTypeId;
+
+    private String bottleTypeTitle;
+
+    private Double itemPrice;
+
+    private Integer itemNumber;
+
+    private Double subtotal;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrdersId() {
+        return ordersId;
+    }
+
+    public void setOrdersId(Integer ordersId) {
+        this.ordersId = ordersId;
+    }
+
+    public Integer getUserDiyId() {
+        return userDiyId;
+    }
+
+    public void setUserDiyId(Integer userDiyId) {
+        this.userDiyId = userDiyId;
+    }
+
+    public String getDiyTitle() {
+        return diyTitle;
+    }
+
+    public void setDiyTitle(String diyTitle) {
+        this.diyTitle = diyTitle;
+    }
+
+    public String getDiyRemark() {
+        return diyRemark;
+    }
+
+    public void setDiyRemark(String diyRemark) {
+        this.diyRemark = diyRemark;
+    }
+
+    public String getDiyImgUrl() {
+        return diyImgUrl;
+    }
+
+    public void setDiyImgUrl(String diyImgUrl) {
+        this.diyImgUrl = diyImgUrl;
+    }
+
+    public String getDiyContent() {
+        return diyContent;
+    }
+
+    public void setDiyContent(String diyContent) {
+        this.diyContent = diyContent;
+    }
+
+    public Integer getBottleId() {
+        return bottleId;
+    }
+
+    public void setBottleId(Integer bottleId) {
+        this.bottleId = bottleId;
+    }
+
+    public String getBottleTitle() {
+        return bottleTitle;
+    }
+
+    public void setBottleTitle(String bottleTitle) {
+        this.bottleTitle = bottleTitle;
+    }
+
+    public Double getBottleWeight() {
+        return bottleWeight;
+    }
+
+    public void setBottleWeight(Double bottleWeight) {
+        this.bottleWeight = bottleWeight;
+    }
+
+    public Integer getBottleTypeId() {
+        return bottleTypeId;
+    }
+
+    public void setBottleTypeId(Integer bottleTypeId) {
+        this.bottleTypeId = bottleTypeId;
+    }
+
+    public String getBottleTypeTitle() {
+        return bottleTypeTitle;
+    }
+
+    public void setBottleTypeTitle(String bottleTypeTitle) {
+        this.bottleTypeTitle = bottleTypeTitle;
+    }
+
+    public Double getItemPrice() {
+        return itemPrice;
+    }
+
+    public void setItemPrice(Double itemPrice) {
+        this.itemPrice = itemPrice;
+    }
+
+    public Integer getItemNumber() {
+        return itemNumber;
+    }
+
+    public void setItemNumber(Integer itemNumber) {
+        this.itemNumber = itemNumber;
+    }
+
+    public Double getSubtotal() {
+        return subtotal;
+    }
+
+    public void setSubtotal(Double subtotal) {
+        this.subtotal = subtotal;
+    }
+}

src/main/java/com/uas/erp/schedular/diymall/domain/Order.java

@@ -1,233 +0,0 @@
-package com.uas.erp.schedular.diymall.domain;
-
-import com.uas.erp.schedular.b2b.domain.KeyEntity;
-import com.uas.erp.schedular.core.Constant;
-import com.uas.erp.schedular.util.DateUtil;
-import com.uas.erp.schedular.util.NumberUtil;
-import com.uas.erp.schedular.util.StringUtil;
-
-import java.util.Date;
-
-/**
- * 金融服务申请数据
- * 
- * @author hejq
- * @time 创建时间：2017年11月24日
- */
-public class Order extends KeyEntity {
-	
-	/**
-	 * ID
-	 */
-	private Long fa_id;
-	
-	/**
-	 * 企业名称
-	 */
-	private String fa_enname;
-
-	/**
-	 * 联系人
-	 */
-	private String fa_contact;
-
-	/**
-	 * 联系电话（座机）
-	 */
-	private String fa_telphone;
-	
-	/**
-	 * 联系电话（手机）
-	 */
-	private String fa_phone;
-	
-	/**
-	 * 申请金额
-	 */
-	private Long fa_appamount;
-	
-	/**
-	 * 申请人
-	 */
-	private String fa_applyman;
-	
-	/**
-	 * 申请日期
-	 */
-	private Date fa_applydate;
-	
-	/**
-	 * 申请得分
-	 */
-	private Double fa_score;
-	
-	/**
-	 * 融资申请单号
-	 */
-	private String fa_busincode;
-	
-	/**
-	 * 保理公司名称
-	 */
-	private String fa_facorpname;
-	
-	/**
-	 * 保理公司
-	 */
-	private String fa_facorpcode;
-	
-	/**
-	 * 金融項目裡面的id
-	 */
-	private Long fa_finid;
-	
-	private Integer fa_hasErp;
-
-	public Long getFa_id() {
-		return fa_id;
-		
-	}
-
-	public void setFa_id(Long fa_id) {
-		this.fa_id = fa_id;
-	}
-
-	public String getFa_enname() {
-		return fa_enname;
-	}
-
-	public void setFa_enname(String fa_enname) {
-		this.fa_enname = fa_enname;
-	}
-
-	public String getFa_contact() {
-		return fa_contact;
-	}
-
-	public void setFa_contact(String fa_contact) {
-		this.fa_contact = fa_contact;
-	}
-
-	public String getFa_telphone() {
-		return fa_telphone;
-	}
-
-	public void setFa_telphone(String fa_telphone) {
-		this.fa_telphone = fa_telphone;
-	}
-
-	public String getFa_phone() {
-		return fa_phone;
-	}
-
-	public void setFa_phone(String fa_phone) {
-		this.fa_phone = fa_phone;
-	}
-
-	public Long getFa_appamount() {
-		return fa_appamount;
-	}
-
-	public void setFa_appamount(Long fa_appamount) {
-		this.fa_appamount = fa_appamount;
-	}
-
-	public String getFa_applyman() {
-		return fa_applyman;
-	}
-
-	public void setFa_applyman(String fa_applyman) {
-		this.fa_applyman = fa_applyman;
-	}
-
-	public String getFa_applydate() {
-		return fa_applydate==null?null: DateUtil.format(fa_applydate, Constant.YMD_HMS);
-	}
-
-	public void setFa_applydate(Date fa_applydate) {
-		this.fa_applydate = fa_applydate;
-	}
-
-	public Double getFa_score() {
-		return fa_score;
-	}
-
-	public void setFa_score(Double fa_score) {
-		this.fa_score = fa_score;
-	}
-
-	public String getFa_busincode() {
-		return fa_busincode;
-	}
-
-	public void setFa_busincode(String fa_busincode) {
-		this.fa_busincode = fa_busincode;
-	}
-
-	public String getFa_facorpname() {
-		return fa_facorpname;
-	}
-
-	public void setFa_facorpname(String fa_facorpname) {
-		this.fa_facorpname = fa_facorpname;
-	}
-
-	public String getFa_facorpcode() {
-		return fa_facorpcode;
-	}
-
-	public void setFa_facorpcode(String fa_facorpcode) {
-		this.fa_facorpcode = fa_facorpcode;
-	}
-
-	public Long getFa_finid() {
-		return fa_finid;
-	}
-
-	public void setFa_finid(Long fa_finid) {
-		this.fa_finid = fa_finid;
-	}
-
-	@Override
-	public Object getKey() {
-		return this.fa_id;
-	}
-
-	public Integer getFa_hasErp() {
-		return fa_hasErp;
-	}
-
-	public void setFa_hasErp(Integer fa_hasErp) {
-		this.fa_hasErp = fa_hasErp;
-	}
-
-	public String toSqlString(int primaryKey) {
-		return "insert into financingapply (fa_id,fa_enname,fa_contact,fa_telphone,fa_phone,fa_appamount,fa_applyman,fa_applydate,fa_score,fa_busincode,fa_facorpname,fa_facorpcode,fa_finid) values ("
-				+ primaryKey
-				+ ",'"
-				+ StringUtil.nvl(fa_enname, "")
-				+ "', '"
-				+ StringUtil.nvl(fa_contact, "")
-				+ "', '"
-				+ StringUtil.nvl(fa_telphone, "")
-				+ "','"
-				+ StringUtil.nvl(fa_phone, "")
-				+ "', "
-				+ NumberUtil.nvl(fa_appamount, 0)
-				+ ", '"
-				+  StringUtil.nvl(fa_applyman, "")
-				+ "', "
-				+ DateUtil.parseDateToOracleString(null, fa_applydate)
-				+ ", "
-				+ fa_score
-				+ ", '"
-				+ fa_busincode
-				+ "', '"
-				+ fa_facorpname
-				+ "', '"
-				+ fa_facorpcode
-				+ "', "
-				+ fa_finid
-				+ ")";
-	}
-}

src/main/java/com/uas/erp/schedular/diymall/task/DiymallApplyTask.java

@@ -1,64 +1,54 @@
 package com.uas.erp.schedular.diymall.task;
 
-import com.uas.erp.schedular.diymall.domain.Order;
+import com.uas.erp.schedular.diymall.domain.DiymallOrder;
+import com.uas.erp.schedular.diymall.domain.DiymallOrderItem;
 import com.uas.erp.schedular.task.support.Method;
 import com.uas.erp.schedular.task.support.Role;
 import com.uas.erp.schedular.task.support.TaskMapping;
 import com.uas.erp.schedular.util.CollectionUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.jdbc.core.JdbcTemplate;
+import com.uas.erp.schedular.util.ContextHolder;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 
 /**
- * Created by Pro1 on 2017/8/4.
+ * Created by huangct on 2017/12/26.
  */
 @Component
 @TaskMapping(title = "定制商城", role = Role.SELLER)
 public class DiymallApplyTask extends AbstractTask {
-
-    @Autowired
-    @Qualifier("secondJdbcTemplate")
-    JdbcTemplate secondJdbcTemplate;
-    
-    @TaskMapping(title = "供应商从定制商城下载客户的订单数据", fixedDelay = 60000, method = Method.DOWNLOAD)
+    @TaskMapping(title = "从定制商城下载客户的订单数据", fixedDelay = 60000, method = Method.DOWNLOAD)
     public void downloadDiymallOrder() {
-		//TODO 获取定制商城订单
-//        List<Order> orders = getForList("/erp/down/loan/unload", Order.class);
-//        if (!CollectionUtils.isEmpty(orders)) {
-//            ContextHolder.setDataSize(orders.size());
-//            saveFinanceDown(orders);
-//            // TODO notice++
-//            // 回执
-//            onSaleDownSuccess(orders);
-//        }
+        List<DiymallOrder> diymallOrders = getForList("/erp/down/loan/unload", DiymallOrder.class);
+        if (!CollectionUtils.isEmpty(diymallOrders)) {
+            ContextHolder.setDataSize(diymallOrders.size());
+            saveSale(diymallOrders);
+            // TODO notice++
+            // 回执
+            onSaleSuccess(diymallOrders);
+        }
     }
 
     /**
-     * 保存financeDown
+     * 保存Sale
      *
-     * @param orders
+     * @param diymallOrders
      */
-    private void saveFinanceDown(List<Order> orders) {
+    private void saveSale(List<DiymallOrder> diymallOrders) {
         List<String> sqls = new ArrayList<>();
         List<Long> idList = new ArrayList<Long>();
-        for (Order order : orders) {
-			//判断之前是否保存过
-            int count = jdbcTemplate.count("from financingapply where fa_finid=?", order.getFa_finid());
+        for (DiymallOrder diymallOrder : diymallOrders) {
+            int count = jdbcTemplate.count("from sale where SA_CODE=?", diymallOrder.getCode());
             if (count == 0) {
-				//生成id
-                int orderId = jdbcTemplate.generate("financingapply_seq");
-                idList.add(Long.valueOf(orderId));
-				//???
-	            if (null != order.getFa_facorpcode()) {
-		            String corpname =jdbcTemplate.getString("select fc_name from FINANCECORPORATION where fc_code = ?",String.class, order.getFa_facorpcode());
-					order.setFa_facorpname(corpname);
-	            }
-	            String sql = order.toSqlString(orderId);
+                int saleId = jdbcTemplate.generate("sale_seq");
+                idList.add(Long.valueOf(saleId));
+                //TODO sale主从表 product物料表
+
+                String sql = diymallOrder.toSqlString(saleId);
                 sqls.add(sql);
             }
         }
@@ -68,31 +58,59 @@ public class DiymallApplyTask extends AbstractTask {
     }
 
     /**
-     * Order，修改金融平台的申请订单为已下载
+     * 保存SaleDetail
      *
-     * @param orders
+     * @param saleId 主表id
+     * @param diymallOrder 定制商城订单
      */
-    private void onSaleDownSuccess(List<Order> orders) {
-        String idStr = CollectionUtil.getKeyString(orders, new CollectionUtil.KeyIterator<Order>() {
-            @Override
-            public Object getKey(Order obj) {
-                return obj.getFa_finid();
-            }
-        });
+    private void saveSaleDetail(int saleId,DiymallOrder diymallOrder) {
+        Set<DiymallOrderItem> diymallOrderItems =  diymallOrder.getDiymallOrderItems();
+        if (!diymallOrderItems.isEmpty()) {
+            for (DiymallOrderItem diymallOrderItem : diymallOrderItems) {
+
+                String bottleTitle = diymallOrderItem.getBottleTitle();
+                String bottleTypeTitle = diymallOrderItem.getBottleTypeTitle();
+                int productId = saveProduct(bottleTitle, bottleTypeTitle);
+                int saleDetailId = jdbcTemplate.generate("SALEDETAIL_SEQ");
 
-		//TODO 更新定制商城上传状态
-        //post("/erp/down/loan/back", dataWrap(idStr));
+                //TODO 保存从表数据
+            }
+        }
     }
 
-    private List<Order> findByStatus(Short status) {
-        Map<String, Object> objects = secondJdbcTemplate.queryForMap("SELECT id,code,payment,user_id,status,display,take_name,take_phone,take_post_code,take_area_id,\n" +
-                "take_area_msg,take_address,to_bank_number,to_bank_name,to_bank_type,to_bank_address,\n" +
-                "from_bank_number,from_bank_name,remark,admin_remark,invoice_name,invoice_number,freight_id,\n" +
-                "freight_price,subtotal,grand_total,tracking_code,tracking_company,tracking_kdn_code,\n" +
-                "tracking_status,tracking_update_date,create_date,payment_date,tracking_date,received_date,\n" +
-                "finish_date,refund_date,syn_data FROM db_orders WHERE syn_data = 0");
-        List<Order> orders = new ArrayList<Order>();
+    /**
+     * 保存Product
+     *
+     * @param bottleTitle 物料规格
+     * @param bottleTypeTitle 物料详情
+     */
+    private int saveProduct(String bottleTitle, String bottleTypeTitle) {
+        int productId;
+        //int count = jdbcTemplate.count("from product where PR_SPEC=? and PR_DETAIL=?", bottleTitle, bottleTypeTitle);
+        String prId  = jdbcTemplate.getString("select PR_ID from product where PR_SPEC=" + bottleTitle +" and PR_DETAIL=" + bottleTypeTitle);
+        if (StringUtils.isEmpty(prId)) {
+            //TODO 插入物料
+            productId = jdbcTemplate.generate("PRODUCT_SEQ");
+            String sql = "insert into PRODUCT (PR_ID, PR_SPEC, PR_DETAIL) values (" + productId + ","+ bottleTitle + "," + bottleTypeTitle + ")";
+            jdbcTemplate.execute(sql);
+        } else {
+            productId = Integer.parseInt(prId);
+        }
+        return productId;
+    }
 
-        return orders;
+    /**
+     * 保存Sale成功，修改定制商城的订单为已下载
+     *
+     * @param diymallOrders
+     */
+    private void onSaleSuccess(List<DiymallOrder> diymallOrders) {
+        String idStr = CollectionUtil.getKeyString(diymallOrders, new CollectionUtil.KeyIterator<DiymallOrder>() {
+            @Override
+            public Object getKey(DiymallOrder obj) {
+                return obj.getId();
+            }
+        });
+        post("/erp/down/loan/back", dataWrap(idStr));
     }
 }

src/main/resources/application.yml

@@ -20,11 +20,6 @@ spring:
   datasource:
     driverClassName: org.h2.Driver
     url: jdbc:h2:mem:uas
-  diymall-datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://14.116.191.225:3306/donate?characterEncoding=utf-8
-    username: root
-    password: zfdzZFDZ2017
   profiles:
     active: dev
 ---