Skip to content

G
gdtel-gztel-school-center
Commit 523af857 by 董有沛
Options

Merge branch 'master' of http://172.18.101.172:9091/dedema/gdtel-gztel-school-center.git

parents 9197a272 586d0b54
Showing with 253 additions and 142 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
...@@ -108,7 +108,7 @@ public class DankuanController { ...@@ -108,7 +108,7 @@ public class DankuanController {
* @throws Exception * @throws Exception
*/ */
@RequestMapping("/createProductOrder") @RequestMapping("/createProductOrder")
public ResponseData<OrderView> createProductOrder(@RequestParam("orderName") String orderName, @RequestParam("orderPhone") String orderPhone, public ResponseData<Object> createProductOrder(@RequestParam("orderName") String orderName, @RequestParam("orderPhone") String orderPhone,
@RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId, @RequestParam("orderNumber") String orderNumber, @RequestParam("orderCustomerStudentId") String orderCustomerStudentId,
@RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd, @RequestParam("orderCustomerAccount") String orderCustomerAccount, @RequestParam("orderCustomerPwd") String orderCustomerPwd,
@RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId, @RequestParam("orderSetMeal") String orderSetMeal, @RequestParam("productId") String productId,
...@@ -179,15 +179,18 @@ public class DankuanController { ...@@ -179,15 +179,18 @@ public class DankuanController {
orderView.setCustomerId("xyzxyql"); orderView.setCustomerId("xyzxyql");
orderView.setOrderCustomerType("学生"); orderView.setOrderCustomerType("学生");
if (webOrderAmount.equals("0")) { if (webOrderAmount.equals("0")) {
ResponseData<OrderView> res = createOrder(orderView, partner, orderSeq); ResponseData<Object> res = createOrder(orderView, partner, orderSeq);
if (!res.isSuccess()) { if (!res.isSuccess()) {
return res; return res;
} }
Order order =(Order) res.getData();
orderV.setOrderRf2(order.getId());
} }
Integer insert = orderViewMapper.insert(orderView); Integer insert = orderViewMapper.insert(orderView);
if (insert == 1) { if (insert == 1) {
orderV.setOrderId(orderView.getOrderId()); orderV.setOrderId(orderView.getOrderId());
orderV.setOrderSeq(orderView.getOrderSeq()); orderV.setOrderSeq(orderView.getOrderSeq());
orderV.setWebOrderAmount(webOrderAmount);
return ResponseData.success(orderV, "订单提交完成！"); return ResponseData.success(orderV, "订单提交完成！");
} }
return ResponseData.error("提交失败！"); return ResponseData.error("提交失败！");
...@@ -201,7 +204,7 @@ public class DankuanController { ...@@ -201,7 +204,7 @@ public class DankuanController {
* @return * @return
* @throws Exception * @throws Exception
*/ */
public ResponseData<OrderView> createOrder(OrderView orderView, String userId, String orderseq) throws Exception { public ResponseData<Object> createOrder(OrderView orderView, String userId, String orderseq) throws Exception {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id = uuid.split("-")[0] + uuid.split("-")[1]; String id = uuid.split("-")[0] + uuid.split("-")[1];
Order order = new Order(); Order order = new Order();
...@@ -262,7 +265,7 @@ public class DankuanController { ...@@ -262,7 +265,7 @@ public class DankuanController {
JSONArray saleList = saleJsonObject.getJSONArray("list"); JSONArray saleList = saleJsonObject.getJSONArray("list");
JSONObject itmeJson = JSONObject.parseObject(saleList.get(0).toString()); JSONObject itmeJson = JSONObject.parseObject(saleList.get(0).toString());
saleId = itmeJson.getString("saleId");*/ saleId = itmeJson.getString("saleId");*/
JSONObject submitOrderJsonObject = getOrderInfo(schoolMap, orderView, currentTimeStr, productId, saleId, "", "", "", ""); JSONObject submitOrderJsonObject = getOrderInfo(schoolMap, orderView, currentTimeStr, productId, saleId, "", "00000", "0元", "00000");
String orderNum = (String) submitOrderJsonObject.get("orderNumber"); String orderNum = (String) submitOrderJsonObject.get("orderNumber");
if (StringUtils.isNotBlank(orderNum)) { if (StringUtils.isNotBlank(orderNum)) {
Wrapper<OrderView> wrapper = new EntityWrapper<>(); Wrapper<OrderView> wrapper = new EntityWrapper<>();
...@@ -279,7 +282,7 @@ public class DankuanController { ...@@ -279,7 +282,7 @@ public class DankuanController {
} else { } else {
return ResponseData.error("智能平台订单创建失败，如有疑问请联系客服！"); return ResponseData.error("智能平台订单创建失败，如有疑问请联系客服！");
} }
return ResponseData.success(orderView, "智能平台订单创建成功"); return ResponseData.success(order, "智能平台订单创建成功");
} }
/** /**
...@@ -318,7 +321,6 @@ public class DankuanController { ...@@ -318,7 +321,6 @@ public class DankuanController {
orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); orderViewMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
wrapper.eq("orderSeq", orderseq);
orderMap = orderViewMapper.selectList(wrapper).get(0); orderMap = orderViewMapper.selectList(wrapper).get(0);
// 根据学校名称，获取该学校信息 // 根据学校名称，获取该学校信息
...@@ -455,7 +457,7 @@ public class DankuanController { ...@@ -455,7 +457,7 @@ public class DankuanController {
//单宽回调后端接口地址 //单宽回调后端接口地址
// map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser"); // map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
map.put("BACKDROPURL", "http://yrym.winsun-aly.com/gdtel-xyzx-hhr/paymentCon/toSubmisOrderPreser.do"); map.put("BACKDROPURL", "http://167460x6b0.51mypc.cn/ciop/dankuan/toSubmisOrderPreser.do");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识 String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识
...@@ -699,13 +701,6 @@ public class DankuanController { ...@@ -699,13 +701,6 @@ public class DankuanController {
qParams.add(new BasicNameValuePair("addressCity", "广州市")); //报装地址城市，必填 qParams.add(new BasicNameValuePair("addressCity", "广州市")); //报装地址城市，必填
signMap.put("addressCity", "广州市"); signMap.put("addressCity", "广州市");
qParams.add(new BasicNameValuePair("deliveryProvince", "广东省"));// 配送地址-省，必填
signMap.put("deliveryProvince", "广东省");
qParams.add(new BasicNameValuePair("deliveryCity", "广州市"));// 配送地址-市，必填
signMap.put("deliveryCity", "广州市");
String addressDistrict = null; String addressDistrict = null;
String address = null; String address = null;
String addressID = null; String addressID = null;
...@@ -755,19 +750,11 @@ public class DankuanController { ...@@ -755,19 +750,11 @@ public class DankuanController {
signMap.put("addressDistrict", addressDistrict); signMap.put("addressDistrict", addressDistrict);
qParams.add(new BasicNameValuePair("address", address)); //报装详细地址，必填 qParams.add(new BasicNameValuePair("address", address)); //报装详细地址，必填
signMap.put("address", address); signMap.put("address", address);
qParams.add(new BasicNameValuePair("deliveryDistrict", addressDistrict));// 配送地址-区，必填
signMap.put("deliveryDistrict", addressDistrict);
qParams.add(new BasicNameValuePair("deliveryAddress", address));// 配送地址-详细地址，必填
signMap.put("deliveryAddress", address);
qParams.add(new BasicNameValuePair("deliveryContact", orderMap.getOrderName())); //报装联系人，必填 qParams.add(new BasicNameValuePair("deliveryContact", orderMap.getOrderName())); //报装联系人，必填
signMap.put("deliveryContact", orderMap.getOrderName()); signMap.put("deliveryContact", orderMap.getOrderName());
qParams.add(new BasicNameValuePair("deliveryContactPhone", orderMap.getOrderPhone())); //报装联系电话，必填 qParams.add(new BasicNameValuePair("deliveryContactPhone", orderMap.getOrderPhone())); //报装联系电话，必填
signMap.put("deliveryContactPhone", orderMap.getOrderPhone()); signMap.put("deliveryContactPhone", orderMap.getOrderPhone());
qParams.add(new BasicNameValuePair("invoiced", "0")); //是否需要发票 0：否 1：是，必填 qParams.add(new BasicNameValuePair("invoiced", "0")); //是否需要发票 0：否 1：是，必填
signMap.put("invoiced", "0"); signMap.put("invoiced", "0");
qParams.add(new BasicNameValuePair("invoiceTitle", "")); //若需要发票，发票抬头，必填 qParams.add(new BasicNameValuePair("invoiceTitle", "")); //若需要发票，发票抬头，必填
...@@ -816,34 +803,13 @@ public class DankuanController { ...@@ -816,34 +803,13 @@ public class DankuanController {
paymentMap.put("bank", "");//缴费银行，缴费方式为“银行划账”时必填 ：[中国银行|中国工商银行|中国农业银行|民生银行|招商银行|中信银行|商业银行|广东发展银行|光大银行|华夏银行|兴业银行|浦发银行|广州农村商业银行|广州银行|深圳发展银行|交通银行|中国建设银行|邮政储蓄] paymentMap.put("bank", "");//缴费银行，缴费方式为“银行划账”时必填 ：[中国银行|中国工商银行|中国农业银行|民生银行|招商银行|中信银行|商业银行|广东发展银行|光大银行|华夏银行|兴业银行|浦发银行|广州农村商业银行|广州银行|深圳发展银行|交通银行|中国建设银行|邮政储蓄]
paymentMap.put("bankNumber", "");//银行账号，缴费方式为“银行划账”时必填 paymentMap.put("bankNumber", "");//银行账号，缴费方式为“银行划账”时必填
paymentMap.put("bankOwner", "");////银行账号持有人，缴费方式为“银行划账”时必填 paymentMap.put("bankOwner", "");////银行账号持有人，缴费方式为“银行划账”时必填
String payPlatform = orderMap.getIPay(); paymentMap.put("payPlatform", "");
if (StringUtils.isNotBlank(payPlatform)) { paymentMap.put("electronicPayNumber", "");//支付流水号，缴费方式为“穗易付”时必填
if ("1".equals(payPlatform)) { paymentMap.put("payOrderNumber", "");// 穗易付订单号，若选择穗易付，此项必填
paymentMap.put("payPlatform", "支付宝");//支付平台，缴费方式为“穗易付”时必填
} else {
paymentMap.put("payPlatform", "微信");//支付平台，缴费方式为“穗易付”时必填
}
} else {
paymentMap.put("payPlatform", "穗易付");//支付平台，缴费方式为“穗易付”时必填
}
if (StringUtils.isNotBlank(UPTRANSEQ)) {
paymentMap.put("electronicPayNumber", UPTRANSEQ);//支付流水号，缴费方式为“穗易付”时必填
} else {
paymentMap.put("electronicPayNumber", "");//支付流水号，缴费方式为“穗易付”时必填
}
if (StringUtils.isNotBlank(ORDERREQTRANSEQ)) {
paymentMap.put("payOrderNumber", ORDERREQTRANSEQ);// 穗易付订单号，若选择穗易付，此项必填
} else {
paymentMap.put("payOrderNumber", "");// 穗易付订单号，若选择穗易付，此项必填
}
if (StringUtils.isNotBlank(ORDERAMOUNT)) {
paymentMap.put("payAmount", ORDERAMOUNT);//缴费金额（打款金额），缴费方式为“代理商打款”或“穗易付”时必填
} else {
paymentMap.put("payAmount", "");//缴费金额（打款金额），缴费方式为“代理商打款”或“穗易付”时必填
}
paymentMap.put("alipayUserid", "");//用户ID，缴费方式为“支付宝支付”时必填 paymentMap.put("alipayUserid", "");//用户ID，缴费方式为“支付宝支付”时必填
paymentMap.put("alipayNumber", "");//支付宝账号，缴费方式为“支付宝支付”时必填 paymentMap.put("alipayNumber", "");//支付宝账号，缴费方式为“支付宝支付”时必填
paymentMap.put("alipayAuthNumber", "");//授权协议号，缴费方式为“支付宝支付”时必填 paymentMap.put("alipayAuthNumber", "");//授权协议号，缴费方式为“支付宝支付”时必填
paymentMap.put("payAmount", "");//缴费金额（打款金额），缴费方式为“代理商打款”或“穗易付”时必填
paymentList.add(paymentMap); paymentList.add(paymentMap);
//产品自定义属性；暂时默认属性名称只能传“日租卡号码” //产品自定义属性；暂时默认属性名称只能传“日租卡号码”
Map<String, String> propertyMap = new HashMap<String, String>(); Map<String, String> propertyMap = new HashMap<String, String>();
......
apply-net/src/main/java/com/winsun/controller/YxtCardController.java 0 → 100644
package com.winsun.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.YxtAddress;
import com.winsun.bean.YxtCoupon;
import com.winsun.mapper.YxtAddressMapper;
import com.winsun.mapper.YxtCouponMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.*;
/**
* 兑换券校检
*
* @Author: xiangli
* @Date:
*/
@Slf4j
@RestController
@RequestMapping("/yxtCard")
public class YxtCardController extends BaseController {
private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@Autowired
private YxtCouponMapper yxtCouponMapper;
@Autowired
private YxtAddressMapper yxtAddressMapper;
/**
* 进入院线通兑换券销售界面
* @return
*/
@RequestMapping("/getCardCount")
public ResponseData<Map<String, Object>> getCardCount() {
Wrapper<YxtCoupon> yxtCouponWrapper = new EntityWrapper<>();
yxtCouponWrapper.eq("state",1);
yxtCouponWrapper.eq("shelf_state",1);
Integer cardNum = yxtCouponMapper.selectCount(yxtCouponWrapper);
Wrapper<YxtCoupon> yxtCouponWrapper1 = new EntityWrapper<>();
yxtCouponWrapper1.eq("state",2);
Integer salesNum = yxtCouponMapper.selectCount(yxtCouponWrapper1);
Map<String, Object> map = new Hashtable<>();
map.put("cardNum",cardNum);
map.put("salesNum",salesNum);
map.put("nMoney",25.0);
return ResponseData.success(map);
}
/**
* 进入院线通实体票下单界面
* @return
*/
@RequestMapping("/enterPay")
public ResponseData<String> enterPay(){
/*String code = request.getParameter("code");
String result = WxInterfacesUtil.getAccess_tokenByCode(code);
if (StringUtils.isNotBlank(result)) {
JSONObject obj = JSONObject.fromObject(result);
String openId = String.valueOf(obj.get("openid"));
// code重复使用时，从session拿出第一次保存openId赋予openId
if("null".equals(openId) && !"null".equals(String.valueOf(request.getSession().getAttribute("openId")))){
openId = String.valueOf(request.getSession().getAttribute("openId"));
}
// code重复使用时，openId为"null"，不更新session
if(!"null".equals(openId)){
request.getSession().setAttribute("openId", openId);
}
request.setAttribute("openId", openId);
System.out.println("openId:" +openId);
}*/
String openId = "isOk";
return ResponseData.success(openId);
}
/**
* 获取用户地址
* @return
*/
@RequestMapping("/getUserAddress")
public ResponseData<List<YxtAddress>> getUserAddress(@RequestParam("userId") String userId,@RequestParam("addressId") String addressId){
Wrapper<YxtAddress> wrapper = new EntityWrapper<>();
if(StringUtils.isNotBlank(addressId)){
wrapper.eq(StringUtils.isNotBlank(userId),"id",addressId);
}else{
wrapper.eq("user_id",userId);
}
List<YxtAddress> list = yxtAddressMapper.selectList(wrapper);
return ResponseData.success(list);
}
/**
* 获取用户地址
* @return
*/
@RequestMapping("/addAddress")
public ResponseData<List<YxtAddress>> addAddress(@RequestParam("address") String address){
HashMap hashMap = JSON.parseObject(address, HashMap.class);
YxtAddress yxtAddress = new YxtAddress();
String userId = hashMap.get("userId").toString();
yxtAddress.setUserId(userId);
String consignee = hashMap.get("consignee").toString();
if(StringUtils.isBlank(consignee)){
return ResponseData.error("收货人不能为空！！！");
}
yxtAddress.setConsignee(consignee);
String phone = hashMap.get("phone").toString();
if(StringUtils.isBlank(phone)){
return ResponseData.error("联系电话不能为空！！！");
}
yxtAddress.setPhone(phone);
String area = hashMap.get("area").toString();
if(StringUtils.isBlank(area)){
return ResponseData.error("地址不能为空！！！");
}
yxtAddress.setArea(area);
yxtAddress.setDetailAddress(hashMap.get("detailAddress").toString());
yxtAddress.setUpdateDate(new Date());
Integer num = yxtAddressMapper.insert(yxtAddress);
if(num==1){
return ResponseData.success();
}
return ResponseData.error("新增地址失败！！！");
}
}
common/src/main/java/com/winsun/bean/LzKpi.java
...@@ -20,36 +20,36 @@ public class LzKpi implements Serializable { ...@@ -20,36 +20,36 @@ public class LzKpi implements Serializable {
* *
*/ */
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private int id; private Integer id;
/** /**
* *
*/ */
@TableId(value = "report_daily") @TableId(value = "report_daily")
private int reportDaily; private Integer reportDaily;
/** /**
* *
*/ */
@TableId(value = "collective_sales") @TableId(value = "collective_sales")
private int collectiveSales; private Integer collectiveSales;
/** /**
* *
*/ */
@TableId(value = "weekly_meeting") @TableId(value = "weekly_meeting")
private int weeklyMeeting; private Integer weeklyMeeting;
/** /**
* *
*/ */
@TableId(value = "organ_training") @TableId(value = "organ_training")
private int organTraining; private Integer organTraining;
/** /**
* *
*/ */
@TableId(value = "design_plan") @TableId(value = "design_plan")
private int designPlan; private Integer designPlan;
/** /**
* *
*/ */
private int kpi; private Integer kpi;
/** /**
* *
*/ */
......
common/src/main/java/com/winsun/bean/LzWage.java
...@@ -42,22 +42,22 @@ public class LzWage implements Serializable { ...@@ -42,22 +42,22 @@ public class LzWage implements Serializable {
* 放号薪酬 * 放号薪酬
*/ */
@TableField("recharge_wage") @TableField("recharge_wage")
private double rechargeWage; private Double rechargeWage;
/** /**
* kpi总值 * kpi总值
*/ */
@TableField("kpi") @TableField("kpi")
private double kpi; private Double kpi;
/** /**
* kpi薪酬 * kpi薪酬
*/ */
@TableField("kpi_wage") @TableField("kpi_wage")
private double kpiWage; private Double kpiWage;
/** /**
* 总薪酬 * 总薪酬
*/ */
@TableField("wage") @TableField("wage")
private double wage; private Double wage;
} }
common/src/main/java/com/winsun/bean/ManagerKpi.java
...@@ -44,7 +44,7 @@ public class ManagerKpi implements Serializable { ...@@ -44,7 +44,7 @@ public class ManagerKpi implements Serializable {
*应发绩效 *应发绩效
*/ */
@TableField("yf_performance") @TableField("yf_performance")
private double yfPerformance; private Double yfPerformance;
/** /**
*kpi总分 *kpi总分
*/ */
...@@ -74,21 +74,21 @@ public class ManagerKpi implements Serializable { ...@@ -74,21 +74,21 @@ public class ManagerKpi implements Serializable {
* 2018年5月至今累计佣金 * 2018年5月至今累计佣金
*/ */
@TableField("total_bonus") @TableField("total_bonus")
private double totalBonus; private Double totalBonus;
/** /**
* 2018年5月至今累计分成 * 2018年5月至今累计分成
*/ */
@TableField("total_fund") @TableField("total_fund")
private double totalFund; private Double totalFund;
/** /**
*秋营达标奖 *秋营达标奖
*/ */
@TableField("autumn_bonus") @TableField("autumn_bonus")
private double autumnBonus; private Double autumnBonus;
/** /**
*应发提成 *应发提成
*/ */
@TableField("yf_bonus") @TableField("yf_bonus")
private double yfBonus; private Double yfBonus;
} }
common/src/main/java/com/winsun/bean/Order.java
...@@ -315,6 +315,8 @@ public class Order implements Serializable{ ...@@ -315,6 +315,8 @@ public class Order implements Serializable{
*/ */
private String parentName; private String parentName;
private Date rhTime;
......
common/src/main/java/com/winsun/bean/SalesOrder.java
package com.winsun.bean; package com.winsun.bean;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
@TableName("hhr_sales_order") @TableName("hhr_sales_order")
public class SalesOrder { public class SalesOrder {
...@@ -114,41 +113,41 @@ public class SalesOrder { ...@@ -114,41 +113,41 @@ public class SalesOrder {
/** /**
* 总激励 * 总激励
*/ */
private double allBonus; private Double allBonus;
/** /**
* 未发放激励 * 未发放激励
*/ */
private double nonSendBonus; private Double nonSendBonus;
/** /**
* 已发放激励 * 已发放激励
*/ */
private double sendBonus; private Double sendBonus;
/** /**
* 最近充值金额 * 最近充值金额
*/ */
private double recentlyAmount; private Double recentlyAmount;
/** /**
* 最近充值激励 * 最近充值激励
*/ */
private double recentlyBonus; private Double recentlyBonus;
/** /**
* 累计充值金额 * 累计充值金额
*/ */
private double monthAmount; private Double monthAmount;
/** /**
* 累计充值激励 * 累计充值激励
*/ */
private double monthBonus; private Double monthBonus;
/** /**
* 本金激励 * 本金激励
*/ */
private double capitalBonus; private Double capitalBonus;
} }
common/src/main/java/com/winsun/bean/YxtOrder.java
...@@ -43,7 +43,7 @@ public class YxtOrder implements Serializable { ...@@ -43,7 +43,7 @@ public class YxtOrder implements Serializable {
*金额 *金额
*/ */
@TableField("total_price") @TableField("total_price")
private double totalPrice; private Double totalPrice;
/** /**
*订单状态 (1:未付款 2：付款成功 3：付款失败 4：已取消订单) *订单状态 (1:未付款 2：付款成功 3：付款失败 4：已取消订单)
*/ */
...@@ -68,7 +68,7 @@ public class YxtOrder implements Serializable { ...@@ -68,7 +68,7 @@ public class YxtOrder implements Serializable {
*兑换券单价 *兑换券单价
*/ */
@TableField("unit_price") @TableField("unit_price")
private double unitPrice; private Double unitPrice;
/** /**
*订单类型 *订单类型
*/ */
......
common/src/main/java/com/winsun/bean/ZjlWage.java
...@@ -57,182 +57,182 @@ public class ZjlWage implements Serializable { ...@@ -57,182 +57,182 @@ public class ZjlWage implements Serializable {
*岗位工资 *岗位工资
*/ */
@TableField("position_wage") @TableField("position_wage")
private double positionWage; private Double positionWage;
/** /**
*绩效奖金（绩效工资+提成） *绩效奖金（绩效工资+提成）
*/ */
@TableField("performance_bonus") @TableField("performance_bonus")
private double performanceBonus; private Double performanceBonus;
/** /**
*专项奖 *专项奖
*/ */
@TableField("special_bonus") @TableField("special_bonus")
private double specialBonus; private Double specialBonus;
/** /**
*年终奖 *年终奖
*/ */
@TableField("year_end_bonus") @TableField("year_end_bonus")
private double yearEndBonus; private Double yearEndBonus;
/** /**
*节日费(元旦,春节,五一,十一) *节日费(元旦,春节,五一,十一)
*/ */
@TableField("festival_fee") @TableField("festival_fee")
private double festivalFee; private Double festivalFee;
/** /**
*高温补贴(6-10月) *高温补贴(6-10月)
*/ */
@TableField("high_subsidy") @TableField("high_subsidy")
private double highSubsidy; private Double highSubsidy;
/** /**
*通讯补贴 *通讯补贴
*/ */
@TableField("correspondence_subsidy") @TableField("correspondence_subsidy")
private double correspondenceSubsidy; private Double correspondenceSubsidy;
/** /**
*餐费补贴 *餐费补贴
*/ */
@TableField("table_money_subsidy") @TableField("table_money_subsidy")
private double tableMoneySubsidy; private Double tableMoneySubsidy;
/** /**
*交通补贴 *交通补贴
*/ */
@TableField("traffic_subsidy") @TableField("traffic_subsidy")
private double trafficSubsidy; private Double trafficSubsidy;
/** /**
*专项奖（秋营奖励） *专项奖（秋营奖励）
*/ */
@TableField("special_bonus_autumn") @TableField("special_bonus_autumn")
private double specialBonusAutumn; private Double specialBonusAutumn;
/** /**
*其他补扣补退 *其他补扣补退
*/ */
@TableField("other_subsidy") @TableField("other_subsidy")
private double otherSubsidy; private Double otherSubsidy;
/** /**
*应发合计 *应发合计
*/ */
@TableField("total_yf") @TableField("total_yf")
private double totalYf; private Double totalYf;
/** /**
*个人养老保险 *个人养老保险
*/ */
@TableField("endowment_insurance_personal") @TableField("endowment_insurance_personal")
private double endowmentInsurancePersonal; private Double endowmentInsurancePersonal;
/** /**
*个人缴纳失业保险 *个人缴纳失业保险
*/ */
@TableField("unenployment_insurance_personal") @TableField("unenployment_insurance_personal")
private double unenploymentInsurancePersonal; private Double unenploymentInsurancePersonal;
/** /**
*个人缴纳医疗保险 *个人缴纳医疗保险
*/ */
@TableField("medicare_personal") @TableField("medicare_personal")
private double medicarePersonal; private Double medicarePersonal;
/** /**
*个人保险小计 *个人保险小计
*/ */
@TableField("total_insurance") @TableField("total_insurance")
private double totalInsurance; private Double totalInsurance;
/** /**
*个人缴纳住房公积金 *个人缴纳住房公积金
*/ */
@TableField("reserved_fund") @TableField("reserved_fund")
private double reservedFund; private Double reservedFund;
/** /**
*个税 *个税
*/ */
@TableField("reserved_fund_tax") @TableField("reserved_fund_tax")
private double reservedFundTax; private Double reservedFundTax;
/** /**
*年终奖个税 *年终奖个税
*/ */
@TableField("year_end_bonus_tax") @TableField("year_end_bonus_tax")
private double yearEndBonusTax; private Double yearEndBonusTax;
/** /**
*个人其他补交补退 *个人其他补交补退
*/ */
@TableField("other_fee_personal") @TableField("other_fee_personal")
private double otherFeePersonal; private Double otherFeePersonal;
/** /**
*个人工会费 *个人工会费
*/ */
@TableField("dues_personal") @TableField("dues_personal")
private double duesPersonal; private Double duesPersonal;
/** /**
*个人缴交小计 *个人缴交小计
*/ */
@TableField("total_fee_personal") @TableField("total_fee_personal")
private double totalFeePersonal; private Double totalFeePersonal;
/** /**
*实发合计 *实发合计
*/ */
@TableField("total_sf") @TableField("total_sf")
private double totalSf; private Double totalSf;
/** /**
*单位养老保险 *单位养老保险
*/ */
@TableField("endowment_insurance_unit") @TableField("endowment_insurance_unit")
private double endowmentInsuranceUnit; private Double endowmentInsuranceUnit;
/** /**
*单位失业保险 *单位失业保险
*/ */
@TableField("unenployment_insurance_unit") @TableField("unenployment_insurance_unit")
private double unenploymentInsuranceUnit; private Double unenploymentInsuranceUnit;
/** /**
*单位医疗保险 *单位医疗保险
*/ */
@TableField("medicare_unit") @TableField("medicare_unit")
private double medicareUnit; private Double medicareUnit;
/** /**
*单位工伤保险 *单位工伤保险
*/ */
@TableField("employment_injury_insurance_unit") @TableField("employment_injury_insurance_unit")
private double employmentInjuryInsuranceUnit; private Double employmentInjuryInsuranceUnit;
/** /**
*单位生育保险 *单位生育保险
*/ */
@TableField("birth_insurance_unit") @TableField("birth_insurance_unit")
private double birthInsuranceUnit; private Double birthInsuranceUnit;
/** /**
*重大疾病保险 *重大疾病保险
*/ */
@TableField("illness_insurance_unit") @TableField("illness_insurance_unit")
private double illnessInsuranceUnit; private Double illnessInsuranceUnit;
/** /**
*单位公积金 *单位公积金
*/ */
@TableField("reserved_fund_unit") @TableField("reserved_fund_unit")
private double reservedFundUnit; private Double reservedFundUnit;
/** /**
*工会计提 *工会计提
*/ */
@TableField("labor_union_fee_unit") @TableField("labor_union_fee_unit")
private double laborUnionFeeUnit; private Double laborUnionFeeUnit;
/** /**
*商业意外险 *商业意外险
*/ */
@TableField("accident_insurance_unit") @TableField("accident_insurance_unit")
private double accidentInsuranceUnit; private Double accidentInsuranceUnit;
/** /**
*残保金 *残保金
*/ */
@TableField("disability_insurance_unit") @TableField("disability_insurance_unit")
private double disabilityInsuranceUnit; private Double disabilityInsuranceUnit;
/** /**
*单位其他补交补退 *单位其他补交补退
*/ */
@TableField("other_fee_unit") @TableField("other_fee_unit")
private double otherFeeUnit; private Double otherFeeUnit;
/** /**
*单位缴交小计 *单位缴交小计
*/ */
@TableField("total_fee_unit") @TableField("total_fee_unit")
private double totalFeeUnit; private Double totalFeeUnit;
/** /**
*总个人人工成本合计 *总个人人工成本合计
*/ */
@TableField("total_cast_personal") @TableField("total_cast_personal")
private double totalCastPersonal; private Double totalCastPersonal;
/** /**
*附加信息 *附加信息
*/ */
...@@ -242,97 +242,97 @@ public class ZjlWage implements Serializable { ...@@ -242,97 +242,97 @@ public class ZjlWage implements Serializable {
*邮电人才服务管理费（200/人） *邮电人才服务管理费（200/人）
*/ */
@TableField("manage_fee") @TableField("manage_fee")
private double manageFee; private Double manageFee;
/** /**
*单位总成本（含支出税点） *单位总成本（含支出税点）
*/ */
@TableField("total_cast_unit") @TableField("total_cast_unit")
private double totalCastUnit; private Double totalCastUnit;
/** /**
*个人缴纳养老保险2 *个人缴纳养老保险2
*/ */
@TableField("endowment_insurance_personal2") @TableField("endowment_insurance_personal2")
private double endowmentInsurancePersonal2; private Double endowmentInsurancePersonal2;
/** /**
*个人缴纳失业保险2 *个人缴纳失业保险2
*/ */
@TableField("unenployment_insurance_personal2") @TableField("unenployment_insurance_personal2")
private double unenploymentInsurancePersonal2; private Double unenploymentInsurancePersonal2;
/** /**
*个人缴纳医疗保险2 *个人缴纳医疗保险2
*/ */
@TableField("medicare_personal2") @TableField("medicare_personal2")
private double medicarePersonal2; private Double medicarePersonal2;
/** /**
*个人缴纳住房公积金2 *个人缴纳住房公积金2
*/ */
@TableField("resvered_fund_personal2") @TableField("resvered_fund_personal2")
private double resveredFundPersonal2; private Double resveredFundPersonal2;
/** /**
*单位养老保险2 *单位养老保险2
*/ */
@TableField("endowment_insurance_unit2") @TableField("endowment_insurance_unit2")
private double endowmentInsuranceUnit2; private Double endowmentInsuranceUnit2;
/** /**
*单位失业保险2 *单位失业保险2
*/ */
@TableField("unenployment_insurance_unit2") @TableField("unenployment_insurance_unit2")
private double unenploymentInsuranceUnit2; private Double unenploymentInsuranceUnit2;
/** /**
*单位医疗保险2 *单位医疗保险2
*/ */
@TableField("medicare_unit2") @TableField("medicare_unit2")
private double medicareUnit2; private Double medicareUnit2;
/** /**
*单位工伤保险2 *单位工伤保险2
*/ */
@TableField("employment_injury_insurance_unit2") @TableField("employment_injury_insurance_unit2")
private double employmentInjuryInsuranceUnit2; private Double employmentInjuryInsuranceUnit2;
/** /**
*单位生育保险2 *单位生育保险2
*/ */
@TableField("birth_insurance_unit2") @TableField("birth_insurance_unit2")
private double birthInsuranceUnit2; private Double birthInsuranceUnit2;
/** /**
*重大疾病保险企业缴纳2 *重大疾病保险企业缴纳2
*/ */
@TableField("illness_insurance_unit2") @TableField("illness_insurance_unit2")
private double illnessInsuranceUnit2; private Double illnessInsuranceUnit2;
/** /**
*单位住房公积金2 *单位住房公积金2
*/ */
@TableField("reserved_insurance_unit2") @TableField("reserved_insurance_unit2")
private double reservedInsuranceUnit2; private Double reservedInsuranceUnit2;
/** /**
*合并计税 *合并计税
*/ */
@TableField("total_insurance_unit2") @TableField("total_insurance_unit2")
private double totalInsuranceUnit2; private Double totalInsuranceUnit2;
/** /**
*本月计税工资 *本月计税工资
*/ */
@TableField("wage") @TableField("wage")
private double wage; private Double wage;
/** /**
*本月抵税扣除 *本月抵税扣除
*/ */
@TableField("wage_tax") @TableField("wage_tax")
private double wageTax; private Double wageTax;
/** /**
*本月工资抵税 *本月工资抵税
*/ */
@TableField("wage_tax_after") @TableField("wage_tax_after")
private double wageTaxAfter; private Double wageTaxAfter;
/** /**
*年终奖应税 *年终奖应税
*/ */
@TableField("last_year_end_bonus") @TableField("last_year_end_bonus")
private double lastYearEndBonus; private Double lastYearEndBonus;
/** /**
*年终奖个税计算 *年终奖个税计算
*/ */
@TableField("last_year_end_bonus_tax") @TableField("last_year_end_bonus_tax")
private double lastYearEndBonusTax; private Double lastYearEndBonusTax;
/** /**
*银行账号 *银行账号
*/ */
...@@ -342,11 +342,11 @@ public class ZjlWage implements Serializable { ...@@ -342,11 +342,11 @@ public class ZjlWage implements Serializable {
*督导成本 *督导成本
*/ */
@TableField("manager_cast") @TableField("manager_cast")
private double managerCast; private Double managerCast;
/** /**
*学子公司成本 *学子公司成本
*/ */
@TableField("xz_company_cast") @TableField("xz_company_cast")
private double xzCompanyCast; private Double xzCompanyCast;
} }
common/src/main/java/com/winsun/constant/Constant.java
...@@ -27,7 +27,7 @@ public class Constant { ...@@ -27,7 +27,7 @@ public class Constant {
public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36"; //智能平台提供的正式key
// public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号 // public final static String ZHENGSHIAUCCON = "xiaoykd"; //智能平台提供的正式账号
// public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key // public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9"; //智能平台提供的正式key
public final static String ZHANGSHIURL = "https://ismartbak.mini189.cn/api/"; //智能平台提供的正式key public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/"; //智能平台提供的正式key
public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key public final static String PRODUCTCATEGORY = "单宽带"; //只能平台提供的key
// public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址 // public final static String TOMCATURL = "http://183.57.78.132:8080"; //Linux外网服务器地址
// public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址 // public final static String INTRANETURL = "http://10.3.1.21:8080"; //Linux内网服务器地址
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -142,7 +142,7 @@ public class PackageNewClothes { ...@@ -142,7 +142,7 @@ public class PackageNewClothes {
, @RequestParam("customerName") String customerName, @RequestParam("partner") String partner , @RequestParam("customerName") String customerName, @RequestParam("partner") String partner
, @RequestParam(value = "idCardzs") String idCardzs, @RequestParam(value = "idCardz") String idCardz, @RequestParam(value = "idCardf") String idCardf , @RequestParam(value = "idCardzs") String idCardzs, @RequestParam(value = "idCardz") String idCardz, @RequestParam(value = "idCardf") String idCardf
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool,@RequestParam(value = "isFromRh") String isFromRh) { , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool,@RequestParam(value = "isFromRh", required = false) String isFromRh) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
} }
...@@ -175,6 +175,9 @@ public class PackageNewClothes { ...@@ -175,6 +175,9 @@ public class PackageNewClothes {
Order order = new Order(); Order order = new Order();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id=uuid.split("-")[0]+uuid.split("-")[1]; String id=uuid.split("-")[0]+uuid.split("-")[1];
if(isFromRh.equals("true")){
order.setUserBussinessType("5");
}
order.setId(id); order.setId(id);
order.setIdCard(idCard); order.setIdCard(idCard);
order.setOrderStatus("待处理"); order.setOrderStatus("待处理");
...@@ -247,7 +250,7 @@ public class PackageNewClothes { ...@@ -247,7 +250,7 @@ public class PackageNewClothes {
, @RequestParam(value = "parentName") String parentName, @RequestParam(value = "idCardf") String idCardf , @RequestParam(value = "parentName") String parentName, @RequestParam(value = "idCardf") String idCardf
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "studentNumber") String studentNumber , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "studentNumber") String studentNumber
, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh") String isFromRh) { , @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
...@@ -282,6 +285,9 @@ public class PackageNewClothes { ...@@ -282,6 +285,9 @@ public class PackageNewClothes {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id=uuid.split("-")[0]+uuid.split("-")[1]; String id=uuid.split("-")[0]+uuid.split("-")[1];
order.setId(id); order.setId(id);
if(isFromRh.equals("true")){
order.setUserBussinessType("5");
}
order.setIdCard(idCard); order.setIdCard(idCard);
order.setOrderStatus("待处理"); order.setOrderStatus("待处理");
order.setUserSchool(userSchool); order.setUserSchool(userSchool);
...@@ -348,7 +354,7 @@ public class PackageNewClothes { ...@@ -348,7 +354,7 @@ public class PackageNewClothes {
, @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam(value = "addRess", required = false) String addRess , @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam(value = "addRess", required = false) String addRess
, @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber , @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh") String isFromRh) { , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) {
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入"); return ResponseData.error("联系号码有误，请重新输入");
} }
...@@ -404,6 +410,9 @@ public class PackageNewClothes { ...@@ -404,6 +410,9 @@ public class PackageNewClothes {
Order order = new Order(); Order order = new Order();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String id=uuid.split("-")[0]+uuid.split("-")[1]; String id=uuid.split("-")[0]+uuid.split("-")[1];
if(isFromRh.equals("true")){
order.setUserBussinessType("5");
}
order.setId(id); order.setId(id);
order.setIdCard(idCard); order.setIdCard(idCard);
order.setXbOrderId(map.get("orderCode").toString()); order.setXbOrderId(map.get("orderCode").toString());
......
service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
...@@ -102,10 +102,10 @@ public class LzSalaryController extends BaseController { ...@@ -102,10 +102,10 @@ public class LzSalaryController extends BaseController {
wage.setUserId(Integer.valueOf(sysUserList.get(0).getId())); wage.setUserId(Integer.valueOf(sysUserList.get(0).getId()));
wage.setMonth(hashMap.get("month").toString()); wage.setMonth(hashMap.get("month").toString());
wage.setRechargeNum(Integer.valueOf(hashMap.get("rechargeNum").toString())); wage.setRechargeNum(Integer.valueOf(hashMap.get("rechargeNum").toString()));
wage.setRechargeWage(Integer.valueOf(hashMap.get("rechargeWage").toString())); wage.setRechargeWage(Double.valueOf(hashMap.get("rechargeWage").toString()));
wage.setKpi(Integer.valueOf(hashMap.get("kpi").toString())); wage.setKpi(Double.valueOf(hashMap.get("kpi").toString()));
wage.setKpiWage(Integer.valueOf(hashMap.get("kpiWage").toString())); wage.setKpiWage(Double.valueOf(hashMap.get("kpiWage").toString()));
wage.setWage(Integer.valueOf(hashMap.get("wage").toString())); wage.setWage(Double.valueOf(hashMap.get("wage").toString()));
lzWageMpapper.insert(wage); lzWageMpapper.insert(wage);
return ResponseData.success("添加成功！"); return ResponseData.success("添加成功！");
} }
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
...@@ -36,7 +36,7 @@ public class OrderTask { ...@@ -36,7 +36,7 @@ public class OrderTask {
} }
@Scheduled(cron = "0 15 10 * * ? ") @Scheduled(cron = "0 0 0 * * ? ")
//@Scheduled(cron = "0/5 * * * * ? ") //@Scheduled(cron = "0/5 * * * * ? ")
//@Scheduled(fixedRate=1000*60) //@Scheduled(fixedRate=1000*60)
@PostMapping("/orderTask") @PostMapping("/orderTask")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment